Title: [176693] trunk/Source/WebKit/mac
- Revision
- 176693
- Author
- [email protected]
- Date
- 2014-12-02 13:53:06 -0800 (Tue, 02 Dec 2014)
Log Message
Yet another build fix.
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController _defaultMenuItemsForLink]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (176692 => 176693)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-02 21:47:05 UTC (rev 176692)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-02 21:53:06 UTC (rev 176693)
@@ -1,5 +1,12 @@
2014-12-02 Beth Dakin <[email protected]>
+ Yet another build fix.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItemsForLink]):
+
+2014-12-02 Beth Dakin <[email protected]>
+
Build fix.
* WebView/WebActionMenuController.mm:
Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (176692 => 176693)
--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-02 21:47:05 UTC (rev 176692)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-02 21:53:06 UTC (rev 176693)
@@ -281,17 +281,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
