Changeset 176746 in webkit

Timestamp:

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

Author:

dburkart@apple.com

Message:

Merged r176693. rdar://problems/18944696

Location:

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

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebActionMenuController.mm (modified) (2 diffs)

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

@@ +1 @@
+2014-12-03  Dana Burkart  <dburkart@apple.com>
+
+        Merge r176693. <rdar://problem/18944696>
+
+    2014-12-02  Beth Dakin  <bdakin@apple.com>
+
+            Yet another 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

@@ -283 +283 @@
     RetainPtr<NSMenuItem> openLinkItem = [self _createActionMenuItemForTag:WebActionMenuItemTagOpenLinkInDefaultBrowser];
 
-    RetainPtr<QLPreviewMenuItem> previewLinkItem;
-    if ([NSMenuItem respondsToSelector:@selector(standardQuickLookMenuItem)]) {
-        previewLinkItem = [NSMenuItem standardQuickLookMenuItem];
-        [previewLinkItem setPreviewStyle:QLPreviewStylePopover];
-        [previewLinkItem setDelegate:self];
+    BOOL shouldUseStandardQuickLookPreview = [NSMenuItem respondsToSelector:@selector(standardQuickLookMenuItem)];
+    RetainPtr<NSMenuItem> previewLinkItem;
+    RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem;
+    if (shouldUseStandardQuickLookPreview) {
+        qlPreviewLinkItem = [NSMenuItem standardQuickLookMenuItem];
+        [qlPreviewLinkItem setPreviewStyle:QLPreviewStylePopover];
+        [qlPreviewLinkItem setDelegate:self];
     } else
         previewLinkItem = [NSMenuItem separatorItem];
@@ -293 +295 @@
     RetainPtr<NSMenuItem> readingListItem = [self _createActionMenuItemForTag:WebActionMenuItemTagAddLinkToSafariReadingList];
 
-    return @[ openLinkItem.get(), previewLinkItem.get(), [NSMenuItem separatorItem], readingListItem.get() ];
+    return @[ openLinkItem.get(), shouldUseStandardQuickLookPreview ? qlPreviewLinkItem.get() : previewLinkItem.get(), [NSMenuItem separatorItem], readingListItem.get() ];
 }