Changeset 175983 in webkit

Timestamp:

Nov 11, 2014, 3:23:22 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Resources/OpenInNewWindowTemplate.pdf (deleted)
• UIProcess/mac/WKActionMenuController.mm (modified) (3 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm

@@ -730 +730 @@
         selector = @selector(_openURLFromActionMenu:);
         title = WEB_UI_STRING_KEY("Open", "Open (action menu item)", "action menu item");
-        image = webKitBundleImageNamed(@"OpenInNewWindowTemplate");
+        image = [NSImage imageNamed:@"NSActionMenuOpenInNewWindow"];
         break;
 
@@ -744 +744 @@
         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;
 
@@ -820 +820 @@
     [item setTag:tag];
     return item;
-}
-
-static NSImage *webKitBundleImageNamed(NSString *name)
-{
-    return [[NSBundle bundleForClass:[WKView class]] imageForResource:name];
 }
 

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -1079 +1079 @@
                 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, ); }; };
@@ -3143 +3142 @@
                 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>"; };
@@ -4019 +4017 @@
                                 8DC2EF5A0486A6940098B216 /* Info.plist */,
                                 089C1666FE841158C02AAC07 /* InfoPlist.strings */,
-                                9348427C19F19BD00009D5AE /* OpenInNewWindowTemplate.pdf */,
                                 E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */,
                                 E133FD891423DD7F00FC7BFB /* WebKit.icns */,
@@ -8336 +8333 @@
                                 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 */,