Skip to site navigation (Press enter)

[webkit-changes] [176056] branches/safari-600.3-branch/Source/WebKit2

matthew_hanson Wed, 12 Nov 2014 18:11:59 -0800

Title: [176056] branches/safari-600.3-branch/Source/WebKit2

Revision: 176056
Author: [email protected]
Date: 2014-11-12 18:11:19 -0800 (Wed, 12 Nov 2014)

Log Message

Merged r175983. rdar://problems/18871984


Modified Paths

branches/safari-600.3-branch/Source/WebKit2/ChangeLog
branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm
branches/safari-600.3-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj


Removed Paths

branches/safari-600.3-branch/Source/WebKit2/Resources/OpenInNewWindowTemplate.pdf

Diff

Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176055 => 176056)


--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog	2014-11-13 02:11:14 UTC (rev 176055)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog	2014-11-13 02:11:19 UTC (rev 176056)
@@ -1,5 +1,25 @@
 2014-11-12  Matthew Hanson  <[email protected]>
 
+        Merge r175983. <rdar://problem/18871984>
+
+    2014-11-11  Tim Horton  <[email protected]>
+
+            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-12  Matthew Hanson  <[email protected]>
+
         Merge r175973. <rdar://problem/18855914>
 
     2014-11-11  Tim Horton  <[email protected]>

Deleted: branches/safari-600.3-branch/Source/WebKit2/Resources/OpenInNewWindowTemplate.pdf


(Binary files differ)

Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176055 => 176056)


--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm	2014-11-13 02:11:14 UTC (rev 176055)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm	2014-11-13 02:11:19 UTC (rev 176056)
@@ -729,7 +729,7 @@
     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 @@
     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 @@
     return item;
 }
 
-static NSImage *webKitBundleImageNamed(NSString *name)
-{
-    return [[NSBundle bundleForClass:[WKView class]] imageForResource:name];
-}
-
 - (PassRefPtr<WebHitTestResult>)_webHitTestResult
 {
     RefPtr<WebHitTestResult> hitTestResult;

Modified: branches/safari-600.3-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (176055 => 176056)


--- branches/safari-600.3-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-11-13 02:11:14 UTC (rev 176055)
+++ branches/safari-600.3-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-11-13 02:11:19 UTC (rev 176056)
@@ -1088,7 +1088,6 @@
 		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 */; };
@@ -3149,7 +3148,6 @@
 		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>"; };
@@ -4013,7 +4011,6 @@
 				1C8AE7601992F62F00ABF6EC /* DockRightLegacy.pdf */,
 				8DC2EF5A0486A6940098B216 /* Info.plist */,
 				089C1666FE841158C02AAC07 /* InfoPlist.strings */,
-				9348427C19F19BD00009D5AE /* OpenInNewWindowTemplate.pdf */,
 				E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */,
 				E133FD891423DD7F00FC7BFB /* WebKit.icns */,
 			);
@@ -8318,7 +8315,6 @@
 				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 */,

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes