Update artwork for some action menu items
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Nov 2014 23:23:22 +0000 (23:23 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Nov 2014 23:23:22 +0000 (23:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=138634
<rdar://problem/18871984>

Reviewed by Anders Carlsson.

* Resources/OpenInNewWindowTemplate.pdf: Removed.
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _createActionMenuItemForTag:]):
(webKitBundleImageNamed): Deleted.
* WebKit2.xcodeproj/project.pbxproj:
Get rid of our custom art, and use system art for two more items.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@175983 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Resources/OpenInNewWindowTemplate.pdf [deleted file]
Source/WebKit2/UIProcess/mac/WKActionMenuController.mm
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

index e82df51f9ee8a8dfc8f784d3b1edd1da8a07d475..b16e375b31ce2ca03b45b20cfcd447f3b8e98b21 100644 (file)
@@ -1,3 +1,18 @@
+2014-11-11  Tim Horton  <timothy_horton@apple.com>
+
+        Update artwork for some action menu items
+        https://bugs.webkit.org/show_bug.cgi?id=138634
+        <rdar://problem/18871984>
+
+        Reviewed by Anders Carlsson.
+
+        * Resources/OpenInNewWindowTemplate.pdf: Removed.
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController _createActionMenuItemForTag:]):
+        (webKitBundleImageNamed): Deleted.
+        * WebKit2.xcodeproj/project.pbxproj:
+        Get rid of our custom art, and use system art for two more items.
+
 2014-11-11  Alexey Proskuryakov  <ap@apple.com>
 
         DRT and WKTR touch disk cache
diff --git a/Source/WebKit2/Resources/OpenInNewWindowTemplate.pdf b/Source/WebKit2/Resources/OpenInNewWindowTemplate.pdf
deleted file mode 100644 (file)
index 85c195e..0000000
Binary files a/Source/WebKit2/Resources/OpenInNewWindowTemplate.pdf and /dev/null differ
index c9fbe2f7380dc801a1028cee385cb0620969c660..9276d275c619751b9e45c02e4f9ca6baa1a32c32 100644 (file)
@@ -729,7 +729,7 @@ static NSString *pathToPhotoOnDisk(NSString *suggestedFilename)
     case kWKContextActionItemTagOpenLinkInDefaultBrowser:
         selector = @selector(_openURLFromActionMenu:);
         title = WEB_UI_STRING_KEY("Open", "Open (action menu item)", "action menu item");
-        image = webKitBundleImageNamed(@"OpenInNewWindowTemplate");
+        image = [NSImage imageNamed:@"NSActionMenuOpenInNewWindow"];
         break;
 
 #if WK_API_ENABLED
@@ -743,7 +743,7 @@ static NSString *pathToPhotoOnDisk(NSString *suggestedFilename)
     case kWKContextActionItemTagAddLinkToSafariReadingList:
         selector = @selector(_addToReadingListFromActionMenu:);
         title = WEB_UI_STRING_KEY("Add to Reading List", "Add to Reading List (action menu item)", "action menu item");
-        image = [NSImage imageNamed:NSImageNameBookmarksTemplate];
+        image = [NSImage imageNamed:@"NSActionMenuAddToReadingList"];
         break;
 
     case kWKContextActionItemTagCopyImage:
@@ -821,11 +821,6 @@ static NSString *pathToPhotoOnDisk(NSString *suggestedFilename)
     return item;
 }
 
-static NSImage *webKitBundleImageNamed(NSString *name)
-{
-    return [[NSBundle bundleForClass:[WKView class]] imageForResource:name];
-}
-
 - (PassRefPtr<WebHitTestResult>)_webHitTestResult
 {
     RefPtr<WebHitTestResult> hitTestResult;
index 35459766d47847f62ffe7154d70cedb8f725533e..916139c63f48f5734e43ec17fc286a9e2e39f953 100644 (file)
                909854EC12BC4E17000AD080 /* WebMemorySampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 905620E812BC248B000799B6 /* WebMemorySampler.cpp */; };
                909854ED12BC4E18000AD080 /* WebMemorySampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 905620E912BC248B000799B6 /* WebMemorySampler.h */; };
                909854EE12BC4E18000AD080 /* WebMemorySampler.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */; };
-               9348427D19F19BD10009D5AE /* OpenInNewWindowTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 9348427C19F19BD00009D5AE /* OpenInNewWindowTemplate.pdf */; };
                934B724419F5B9BE00AE96D6 /* WKActionMenuItemTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 934B724319F5B9BE00AE96D6 /* WKActionMenuItemTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                935EEB9B1277617C003322B8 /* WKBundleBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 935EEB981277616D003322B8 /* WKBundleBackForwardListItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
                935EEB9E127761AC003322B8 /* WKBundleBackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 935EEB951277616D003322B8 /* WKBundleBackForwardList.cpp */; };
                905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMemorySampler.mac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                905620E812BC248B000799B6 /* WebMemorySampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMemorySampler.cpp; sourceTree = "<group>"; };
                905620E912BC248B000799B6 /* WebMemorySampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMemorySampler.h; sourceTree = "<group>"; };
-               9348427C19F19BD00009D5AE /* OpenInNewWindowTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = OpenInNewWindowTemplate.pdf; path = Resources/OpenInNewWindowTemplate.pdf; sourceTree = "<group>"; };
                934B724319F5B9BE00AE96D6 /* WKActionMenuItemTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKActionMenuItemTypes.h; sourceTree = "<group>"; };
                935EEB8F1277615D003322B8 /* InjectedBundleBackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleBackForwardList.cpp; sourceTree = "<group>"; };
                935EEB901277615D003322B8 /* InjectedBundleBackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleBackForwardList.h; sourceTree = "<group>"; };
                                1C8AE7601992F62F00ABF6EC /* DockRightLegacy.pdf */,
                                8DC2EF5A0486A6940098B216 /* Info.plist */,
                                089C1666FE841158C02AAC07 /* InfoPlist.strings */,
-                               9348427C19F19BD00009D5AE /* OpenInNewWindowTemplate.pdf */,
                                E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */,
                                E133FD891423DD7F00FC7BFB /* WebKit.icns */,
                        );
                                E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */,
                                1CBC945E16515ED200D68AAE /* DockBottom.pdf in Resources */,
                                E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */,
-                               9348427D19F19BD10009D5AE /* OpenInNewWindowTemplate.pdf in Resources */,
                                1CB75C941701E880009F809F /* DockRight.pdf in Resources */,
                                1C8AE7611992F63A00ABF6EC /* DockBottomLegacy.pdf in Resources */,
                                8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,