Title: [176690] trunk/Source
- Revision
- 176690
- Author
- [email protected]
- Date
- 2014-12-02 13:31:48 -0800 (Tue, 02 Dec 2014)
Log Message
Source/WebKit/mac:
More build fixing.
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController _defaultMenuItemsForLink]):
Source/WebKit2:
More build fix.
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _defaultMenuItemsForLink]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (176689 => 176690)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-02 21:20:19 UTC (rev 176689)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-02 21:31:48 UTC (rev 176690)
@@ -1,5 +1,12 @@
2014-12-02 Beth Dakin <[email protected]>
+ More build fixing.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItemsForLink]):
+
+2014-12-02 Beth Dakin <[email protected]>
+
Should use standardQuickLookMenuItem for apps that don't implement customizations
https://bugs.webkit.org/show_bug.cgi?id=139193
-and corresponding-
Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (176689 => 176690)
--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-02 21:20:19 UTC (rev 176689)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-02 21:31:48 UTC (rev 176690)
@@ -281,9 +281,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: trunk/Source/WebKit2/ChangeLog (176689 => 176690)
--- trunk/Source/WebKit2/ChangeLog 2014-12-02 21:20:19 UTC (rev 176689)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-02 21:31:48 UTC (rev 176690)
@@ -1,3 +1,10 @@
+2014-12-02 Beth Dakin <[email protected]>
+
+ More build fix.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForLink]):
+
2014-12-02 Dan Bernstein <[email protected]>
REGRESSION: Dragging selected text changes the selection
Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176689 => 176690)
--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 21:20:19 UTC (rev 176689)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 21:31:48 UTC (rev 176690)
@@ -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
