Changeset 176743 in webkit

Timestamp:

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

Author:

dburkart@apple.com

Message:

Merged r176690. 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 r176690. <rdar://problem/18944696>
+
+    2014-12-02  Beth Dakin  <bdakin@apple.com>
+
+            More build fixing.
+
+            * WebView/WebActionMenuController.mm:
+            (-[WebActionMenuController _defaultMenuItemsForLink]):
+
+
 2014-12-03  Dana Burkart  <dburkart@apple.com>
 

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

@@ -283 +283 @@
     RetainPtr<NSMenuItem> openLinkItem = [self _createActionMenuItemForTag:WebActionMenuItemTagOpenLinkInDefaultBrowser];
 
-    RetainPtr<QLPreviewMenuItem> previewLinkItem = [NSMenuItem standardQuickLookMenuItem];
-    [previewLinkItem setPreviewStyle:QLPreviewStylePopover];
-    [previewLinkItem setDelegate:self];
+    RetainPtr<QLPreviewMenuItem> previewLinkItem;
+    if ([NSMenuItem instancesRespondToSelector:@selector(standardQuickLookMenuItem)]) {
+        previewLinkItem = [NSMenuItem standardQuickLookMenuItem];
+        [previewLinkItem setPreviewStyle:QLPreviewStylePopover];
+        [previewLinkItem setDelegate:self];
+    } else
+        previewLinkItem = [NSMenuItem separatorItem];
 
     RetainPtr<NSMenuItem> readingListItem = [self _createActionMenuItemForTag:WebActionMenuItemTagAddLinkToSafariReadingList];

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

@@ +1 @@
+2014-12-03  Dana Burkart  <dburkart@apple.com>
+
+        Merge r176690. <rdar://problem/18944696>
+
+    2014-12-02  Beth Dakin  <bdakin@apple.com>
+
+            More 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];
+    BOOL shouldUseStandardQuickLookPreview = [_wkView _shouldUseStandardQuickLookPreview] && [NSMenuItem instancesRespondToSelector:@selector(standardQuickLookMenuItem)];
     RetainPtr<NSMenuItem> previewLinkItem;
     RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem;