Changeset 176744 in webkit

Timestamp:

Dec 3, 2014, 12:36:14 PM (12 years ago)

Author:

dburkart@apple.com

Message:

Merged r176691. rdar://problems/18944696

Location:

branches/safari-600.3-branch/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebActionMenuController.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/WKActionMenuController.mm (modified) (1 diff)

branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-12-03  Dana Burkart  <dburkart@apple.com>
+
+        Merge r176691. <rdar://problem/18944696>
+
+    2014-12-02  Beth Dakin  <bdakin@apple.com>
+
+            Build fix.
+
+            * WebView/WebActionMenuController.mm:
+            (-[WebActionMenuController _defaultMenuItemsForLink]):
+
+
 2014-12-03  Dana Burkart  <dburkart@apple.com>
 

branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm

@@ -284 +284 @@
 
     RetainPtr<QLPreviewMenuItem> previewLinkItem;
-    if ([NSMenuItem instancesRespondToSelector:@selector(standardQuickLookMenuItem)]) {
+    if ([NSMenuItem respondsToSelector:@selector(standardQuickLookMenuItem)]) {
         previewLinkItem = [NSMenuItem standardQuickLookMenuItem];
         [previewLinkItem setPreviewStyle:QLPreviewStylePopover];

branches/safari-600.3-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-03  Dana Burkart  <dburkart@apple.com>
+
+        Merge r176691. <rdar://problem/18944696>
+
+    2014-12-02  Beth Dakin  <bdakin@apple.com>
+
+            Build fix.
+
+            * UIProcess/mac/WKActionMenuController.mm:
+            (-[WKActionMenuController _defaultMenuItemsForLink]):
+
+
 2014-12-03  Dana Burkart  <dburkart@apple.com>
 

branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm

@@ -395 +395 @@
     RetainPtr<NSMenuItem> openLinkItem = [self _createActionMenuItemForTag:kWKContextActionItemTagOpenLinkInDefaultBrowser];
 
-    BOOL shouldUseStandardQuickLookPreview = [_wkView _shouldUseStandardQuickLookPreview] && [NSMenuItem instancesRespondToSelector:@selector(standardQuickLookMenuItem)];
+    BOOL shouldUseStandardQuickLookPreview = [_wkView _shouldUseStandardQuickLookPreview] && [NSMenuItem respondsToSelector:@selector(standardQuickLookMenuItem)];
     RetainPtr<NSMenuItem> previewLinkItem;
     RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem;