Title: [191311] trunk/Source/WebKit2
- Revision
- 191311
- Author
- timothy_hor...@apple.com
- Date
- 2015-10-19 13:07:50 -0700 (Mon, 19 Oct 2015)
Log Message
Try again to fix the 32-bit build.
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::setupServicesMenu):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191310 => 191311)
--- trunk/Source/WebKit2/ChangeLog 2015-10-19 20:07:37 UTC (rev 191310)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-19 20:07:50 UTC (rev 191311)
@@ -1,3 +1,10 @@
+2015-10-19 Tim Horton <timothy_hor...@apple.com>
+
+ Try again to fix the 32-bit build.
+
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::setupServicesMenu):
+
2015-10-17 Wenson Hsieh <wenson_hs...@apple.com>
Extend fast-clicking behavior to trigger on elements that have negligible zoom
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191310 => 191311)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-19 20:07:37 UTC (rev 191310)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-19 20:07:50 UTC (rev 191311)
@@ -261,12 +261,12 @@
auto cgImage = image->makeCGImage();
auto nsImage = adoptNS([[NSImage alloc] initWithCGImage:cgImage.get() size:image->size()]);
- RetainPtr<NSItemProvider> itemProvider;
#ifdef __LP64__
- itemProvider = adoptNS([[NSItemProvider alloc] initWithItem:[nsImage TIFFRepresentation] typeIdentifier:(__bridge NSString *)kUTTypeTIFF]);
+ auto itemProvider = adoptNS([[NSItemProvider alloc] initWithItem:[nsImage TIFFRepresentation] typeIdentifier:(__bridge NSString *)kUTTypeTIFF]);
+ items = @[ itemProvider.get() ];
+#else
+ items = @[ ];
#endif
-
- items = @[ itemProvider.get() ];
} else if (!context.controlledSelectionData().isEmpty()) {
RetainPtr<NSData> selectionData = adoptNS([[NSData alloc] initWithBytes:(void*)context.controlledSelectionData().data() length:context.controlledSelectionData().size()]);
RetainPtr<NSAttributedString> selection = adoptNS([[NSAttributedString alloc] initWithRTFD:selectionData.get() documentAttributes:nil]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
