Title: [176245] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 176245
- Author
- dburk...@apple.com
- Date
- 2014-11-17 19:05:35 -0800 (Mon, 17 Nov 2014)
Log Message
Merge r176145. rdar://problem/18989840
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176244 => 176245)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-11-18 03:01:20 UTC (rev 176244)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-11-18 03:05:35 UTC (rev 176245)
@@ -1,5 +1,19 @@
2014-11-17 Dana Burkart <dburk...@apple.com>
+ Merge r176145. <rdar://problem/18989840>
+
+ 2014-11-14 Timothy Horton <timothy_hor...@apple.com>
+
+ Update some artwork for the legacy WebKit action menu
+ https://bugs.webkit.org/show_bug.cgi?id=138758
+ <rdar://problem/18989840>
+
+ * WebView/WebActionMenuController.mm:
+ (webKitBundleImageNamed): Deleted.
+ Fix the build.
+
+2014-11-17 Dana Burkart <dburk...@apple.com>
+
Merge r176143. <rdar://problem/18989840>
2014-11-14 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (176244 => 176245)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-18 03:01:20 UTC (rev 176244)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-18 03:05:35 UTC (rev 176245)
@@ -785,11 +785,6 @@
return item;
}
-static NSImage *webKitBundleImageNamed(NSString *name)
-{
- return [[NSBundle bundleForClass:NSClassFromString(@"WKView")] imageForResource:name];
-}
-
- (NSArray *)_defaultMenuItems
{
NSURL *url = ""
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
