Title: [176743] branches/safari-600.3-branch/Source
- Revision
- 176743
- Author
- [email protected]
- Date
- 2014-12-03 12:36:02 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r176690. rdar://problems/18944696
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176742 => 176743)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-03 20:35:47 UTC (rev 176742)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-03 20:36:02 UTC (rev 176743)
@@ -1,5 +1,17 @@
2014-12-03 Dana Burkart <[email protected]>
+ Merge r176690. <rdar://problem/18944696>
+
+ 2014-12-02 Beth Dakin <[email protected]>
+
+ More build fixing.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItemsForLink]):
+
+
+2014-12-03 Dana Burkart <[email protected]>
+
Merge r176684. <rdar://problem/18944696>
2014-12-02 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (176742 => 176743)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-03 20:35:47 UTC (rev 176742)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-03 20:36:02 UTC (rev 176743)
@@ -282,9 +282,13 @@
{
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];
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176742 => 176743)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-03 20:35:47 UTC (rev 176742)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-03 20:36:02 UTC (rev 176743)
@@ -1,5 +1,17 @@
2014-12-03 Dana Burkart <[email protected]>
+ Merge r176690. <rdar://problem/18944696>
+
+ 2014-12-02 Beth Dakin <[email protected]>
+
+ More build fix.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForLink]):
+
+
+2014-12-03 Dana Burkart <[email protected]>
+
Merge r176684. <rdar://problem/18944696>
2014-12-02 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176742 => 176743)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-03 20:35:47 UTC (rev 176742)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-03 20:36:02 UTC (rev 176743)
@@ -394,7 +394,7 @@
{
RetainPtr<NSMenuItem> openLinkItem = [self _createActionMenuItemForTag:kWKContextActionItemTagOpenLinkInDefaultBrowser];
- BOOL shouldUseStandardQuickLookPreview = [_wkView _shouldUseStandardQuickLookPreview];
+ BOOL shouldUseStandardQuickLookPreview = [_wkView _shouldUseStandardQuickLookPreview] && [NSMenuItem instancesRespondToSelector:@selector(standardQuickLookMenuItem)];
RetainPtr<NSMenuItem> previewLinkItem;
RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem;
if (shouldUseStandardQuickLookPreview) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
