Changeset 176690 in webkit

Timestamp:

Dec 2, 2014, 1:31:48 PM (12 years ago)

Author:

Beth Dakin

Message:

Source/WebKit/mac:
More build fixing.

• WebView/WebActionMenuController.mm:

(-[WebActionMenuController _defaultMenuItemsForLink]):

Source/WebKit2:
More build fix.

• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController _defaultMenuItemsForLink]):

Location:

trunk/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)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-12-02  Beth Dakin  <bdakin@apple.com>
+
+        More build fixing.
+
+        * WebView/WebActionMenuController.mm:
+        (-[WebActionMenuController _defaultMenuItemsForLink]):
+
 2014-12-02  Beth Dakin  <bdakin@apple.com>
 

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

@@ -282 +282 @@
     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];

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-02  Beth Dakin  <bdakin@apple.com>
+
+        More build fix.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController _defaultMenuItemsForLink]):
+
 2014-12-02  Dan Bernstein  <mitz@apple.com>
 

trunk/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;