Title: [175591] trunk/Source/WebKit2
- Revision
- 175591
- Author
- ander...@apple.com
- Date
- 2014-11-04 17:07:45 -0800 (Tue, 04 Nov 2014)
Log Message
Try to fix the 32-bit build.
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _defaultMenuItemsForLink]):
(-[WKActionMenuController _createActionMenuItemForTag:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (175590 => 175591)
--- trunk/Source/WebKit2/ChangeLog 2014-11-05 00:53:55 UTC (rev 175590)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-05 01:07:45 UTC (rev 175591)
@@ -1,3 +1,11 @@
+2014-11-04 Anders Carlsson <ander...@apple.com>
+
+ Try to fix the 32-bit build.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForLink]):
+ (-[WKActionMenuController _createActionMenuItemForTag:]):
+
2014-11-04 Conrad Shultz <conrad_shu...@apple.com>
Use a web view for Quick Look in action menus
Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175590 => 175591)
--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-05 00:53:55 UTC (rev 175590)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-05 01:07:45 UTC (rev 175591)
@@ -70,6 +70,7 @@
- (NSArray *)_actionMenuItemsForHitTestResult:(WKHitTestResultRef)hitTestResult defaultActionMenuItems:(NSArray *)defaultMenuItems;
@end
+#if WK_API_ENABLED
@interface WKPagePreviewViewController : NSViewController {
@public
NSSize _preferredSize;
@@ -106,6 +107,7 @@
}
@end
+#endif
@implementation WKActionMenuController
@@ -215,7 +217,11 @@
- (NSArray *)_defaultMenuItemsForLink
{
RetainPtr<NSMenuItem> openLinkItem = [self _createActionMenuItemForTag:kWKContextActionItemTagOpenLinkInDefaultBrowser];
+#if WK_API_ENABLED
RetainPtr<NSMenuItem> previewLinkItem = [self _createActionMenuItemForTag:kWKContextActionItemTagPreviewLink];
+#else
+ RetainPtr<NSMenuItem> previewLinkItem = [NSMenuItem separatorItem];
+#endif
RetainPtr<NSMenuItem> readingListItem = [self _createActionMenuItemForTag:kWKContextActionItemTagAddLinkToSafariReadingList];
return @[ openLinkItem.get(), previewLinkItem.get(), [NSMenuItem separatorItem], readingListItem.get() ];
@@ -234,6 +240,7 @@
[service performWithItems:@[ [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()] ]];
}
+#if WK_API_ENABLED
- (void)_previewURLFromActionMenu:(id)sender
{
WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
@@ -253,6 +260,7 @@
[popover setContentViewController:previewViewController.get()];
return popover;
}
+#endif
#pragma mark Image actions
@@ -530,11 +538,13 @@
image = webKitBundleImageNamed(@"OpenInNewWindowTemplate");
break;
+#if WK_API_ENABLED
case kWKContextActionItemTagPreviewLink:
selector = @selector(_previewURLFromActionMenu:);
title = @"Preview";
image = [NSImage imageNamed:@"NSActionMenuQuickLook"];
break;
+#endif
case kWKContextActionItemTagAddLinkToSafariReadingList:
selector = @selector(_addToReadingListFromActionMenu:);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
