Changeset 175425 in webkit

Timestamp:

Oct 31, 2014, 2:25:42 PM (11 years ago)

Author:

Beth Dakin

Message:

Use system art for action menus when possible
​https://bugs.webkit.org/show_bug.cgi?id=138260

Reviewed by Tim Horton.

Source/WebKit/mac:

• WebView/WebActionMenuController.mm:

(-[WebActionMenuController _createActionMenuItemForTag:withHitTestResult:]):

Source/WebKit2:

• Resources/AddImageToPhotosTemplate.pdf: Removed.
• Resources/CopyImageTemplate.pdf: Removed.
• Resources/SaveImageToDownloadsTemplate.pdf: Removed.
• Resources/ShareImageTemplate.pdf: Removed.
• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController _createActionMenuItemForTag:]):

• WebKit2.xcodeproj/project.pbxproj:

Location:

trunk/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebActionMenuController.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Resources/AddImageToPhotosTemplate.pdf (deleted)
• WebKit2/Resources/CopyImageTemplate.pdf (deleted)
• WebKit2/Resources/SaveImageToDownloadsTemplate.pdf (deleted)
• WebKit2/Resources/ShareImageTemplate.pdf (deleted)
• WebKit2/UIProcess/mac/WKActionMenuController.mm (modified) (4 diffs)
• WebKit2/WebKit2.xcodeproj/project.pbxproj (modified) (5 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-10-31  Beth Dakin  <bdakin@apple.com>
+
+        Use system art for action menus when possible
+        https://bugs.webkit.org/show_bug.cgi?id=138260
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebActionMenuController.mm:
+        (-[WebActionMenuController _createActionMenuItemForTag:withHitTestResult:]):
+
 2014-10-30  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm

@@ -194 +194 @@
         selector = @selector(_quickLookURLFromActionMenu:);
         title = @"Preview";
-        image = [NSImage imageNamed:NSImageNameQuickLookTemplate];
+        image = [NSImage imageNamed:@"NSActionMenuQuickLook"];
         representedObject = hitTestResult;
         break;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-10-31  Beth Dakin  <bdakin@apple.com>
+
+        Use system art for action menus when possible
+        https://bugs.webkit.org/show_bug.cgi?id=138260
+
+        Reviewed by Tim Horton.
+
+        * Resources/AddImageToPhotosTemplate.pdf: Removed.
+        * Resources/CopyImageTemplate.pdf: Removed.
+        * Resources/SaveImageToDownloadsTemplate.pdf: Removed.
+        * Resources/ShareImageTemplate.pdf: Removed.
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController _createActionMenuItemForTag:]):
+        * WebKit2.xcodeproj/project.pbxproj:
+
 2014-10-31  Timothy Horton  <timothy_horton@apple.com>
 

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

@@ -392 +392 @@
         selector = @selector(_quickLookURLFromActionMenu:);
         title = @"Preview";
-        image = [NSImage imageNamed:NSImageNameQuickLookTemplate];
+        image = [NSImage imageNamed:@"NSActionMenuQuickLook"];
         break;
 
@@ -404 +404 @@
         selector = @selector(_copyImage:);
         title = @"Copy";
-        image = webKitBundleImageNamed(@"CopyImageTemplate");
+        image = [NSImage imageNamed:@"NSActionMenuCopy"];
         break;
 
@@ -410 +410 @@
         selector = @selector(_addImageToPhotos:);
         title = @"Add to Photos";
-        image = webKitBundleImageNamed(@"AddImageToPhotosTemplate");
+        image = [NSImage imageNamed:@"NSActionMenuAddToPhotos"];
         break;
 
@@ -416 +416 @@
         selector = @selector(_saveImageToDownloads:);
         title = @"Save to Downloads";
-        image = webKitBundleImageNamed(@"SaveImageToDownloadsTemplate");
+        image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"];
         break;
 
     case kWKContextActionItemTagShareImage:
         title = @"Share";
-        image = webKitBundleImageNamed(@"ShareImageTemplate");
+        image = [NSImage imageNamed:@"NSActionMenuShare"];
         break;
 

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

@@ -1090 +1090 @@
                 935EEBA3127761D3003322B8 /* InjectedBundleBackForwardListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 935EEB911277615D003322B8 /* InjectedBundleBackForwardListItem.cpp */; };
                 935EEBA4127761D6003322B8 /* InjectedBundleBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 935EEB921277615D003322B8 /* InjectedBundleBackForwardListItem.h */; };
-                9369104219F711810021D470 /* CopyImageTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 9369104119F711810021D470 /* CopyImageTemplate.pdf */; };
-                9369104419F711910021D470 /* AddImageToPhotosTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 9369104319F711910021D470 /* AddImageToPhotosTemplate.pdf */; };
-                9369104619F7119E0021D470 /* SaveImageToDownloadsTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 9369104519F7119E0021D470 /* SaveImageToDownloadsTemplate.pdf */; };
-                9369104819F711A70021D470 /* ShareImageTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 9369104719F711A70021D470 /* ShareImageTemplate.pdf */; };
                 9391F2CA121B679A00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */; };
                 9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */; };
@@ -3150 +3146 @@
                 935EEB971277616D003322B8 /* WKBundleBackForwardListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleBackForwardListItem.cpp; sourceTree = "<group>"; };
                 935EEB981277616D003322B8 /* WKBundleBackForwardListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleBackForwardListItem.h; sourceTree = "<group>"; };
-                9369104119F711810021D470 /* CopyImageTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = CopyImageTemplate.pdf; path = Resources/CopyImageTemplate.pdf; sourceTree = "<group>"; };
-                9369104319F711910021D470 /* AddImageToPhotosTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = AddImageToPhotosTemplate.pdf; path = Resources/AddImageToPhotosTemplate.pdf; sourceTree = "<group>"; };
-                9369104519F7119E0021D470 /* SaveImageToDownloadsTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = SaveImageToDownloadsTemplate.pdf; path = Resources/SaveImageToDownloadsTemplate.pdf; sourceTree = "<group>"; };
-                9369104719F711A70021D470 /* ShareImageTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = ShareImageTemplate.pdf; path = Resources/ShareImageTemplate.pdf; sourceTree = "<group>"; };
                 9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameNetworkingContext.h; sourceTree = "<group>"; };
                 9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameNetworkingContext.mm; sourceTree = "<group>"; };
@@ -4005 +3997 @@
                                 7CB16FE11724B9B5007A0A95 /* PlugInSandboxProfiles */,
                                 6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb.in */,
-                                9369104319F711910021D470 /* AddImageToPhotosTemplate.pdf */,
-                                9369104119F711810021D470 /* CopyImageTemplate.pdf */,
                                 1CBC945D16515ED200D68AAE /* DockBottom.pdf */,
                                 1CB75C931701E880009F809F /* DockRight.pdf */,
@@ -4014 +4004 @@
                                 089C1666FE841158C02AAC07 /* InfoPlist.strings */,
                                 9348427C19F19BD00009D5AE /* OpenInNewWindowTemplate.pdf */,
-                                9369104519F7119E0021D470 /* SaveImageToDownloadsTemplate.pdf */,
-                                9369104719F711A70021D470 /* ShareImageTemplate.pdf */,
                                 E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */,
                                 E133FD891423DD7F00FC7BFB /* WebKit.icns */,
@@ -8307 +8295 @@
                         buildActionMask = 2147483647;
                         files = (
-                                9369104619F7119E0021D470 /* SaveImageToDownloadsTemplate.pdf in Resources */,
                                 E17AE2C316B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb in Resources */,
                                 E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */,
-                                9369104419F711910021D470 /* AddImageToPhotosTemplate.pdf in Resources */,
                                 1CBC945E16515ED200D68AAE /* DockBottom.pdf in Resources */,
                                 E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */,
                                 9348427D19F19BD10009D5AE /* OpenInNewWindowTemplate.pdf in Resources */,
-                                9369104219F711810021D470 /* CopyImageTemplate.pdf in Resources */,
-                                9369104819F711A70021D470 /* ShareImageTemplate.pdf in Resources */,
                                 1CB75C941701E880009F809F /* DockRight.pdf in Resources */,
                                 1C8AE7611992F63A00ABF6EC /* DockBottomLegacy.pdf in Resources */,