Title: [176746] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 176746
- Author
- [email protected]
- Date
- 2014-12-03 12:36:43 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r176693. rdar://problems/18944696
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176745 => 176746)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-03 20:36:26 UTC (rev 176745)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-03 20:36:43 UTC (rev 176746)
@@ -1,5 +1,17 @@
2014-12-03 Dana Burkart <[email protected]>
+ Merge r176693. <rdar://problem/18944696>
+
+ 2014-12-02 Beth Dakin <[email protected]>
+
+ Yet another build fix.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItemsForLink]):
+
+
+2014-12-03 Dana Burkart <[email protected]>
+
Merge r176691. <rdar://problem/18944696>
2014-12-02 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (176745 => 176746)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-03 20:36:26 UTC (rev 176745)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-03 20:36:43 UTC (rev 176746)
@@ -282,17 +282,19 @@
{
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];
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() ];
}
#pragma mark Mailto Link actions
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
