Try to fix the 32-bit build.
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Oct 2015 19:09:14 +0000 (19:09 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Oct 2015 19:09:14 +0000 (19:09 +0000)
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::setupServicesMenu):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191303 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm

index 7bd60fa70bec0d2653705d910ddf87f28da0cad7..38499dcb10e886ca9f7c4a58fb72db203e917ff4 100644 (file)
@@ -1,3 +1,10 @@
+2015-10-19  Tim Horton  <timothy_horton@apple.com>
+
+        Try to fix the 32-bit build.
+
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (WebKit::WebContextMenuProxyMac::setupServicesMenu):
+
 2015-10-16  Anders Carlsson  <andersca@apple.com>
 
         Fix image service menus somewhat
index 3c1d895c08a9a2b6ed0d84bf5f9735b1386ec346..907a98dc060ea473435aa46065acf98351c0cfce 100644 (file)
@@ -261,7 +261,10 @@ void WebContextMenuProxyMac::setupServicesMenu(const ContextMenuContextData& con
         auto cgImage = image->makeCGImage();
         auto nsImage = adoptNS([[NSImage alloc] initWithCGImage:cgImage.get() size:image->size()]);
 
-        auto itemProvider = adoptNS([[NSItemProvider alloc] initWithItem:[nsImage TIFFRepresentation] typeIdentifier:(__bridge NSString *)kUTTypeTIFF]);
+        RetainPtr<NSItemProvider> itemProvider;
+#ifdef __LP64__
+        itemProvider = adoptNS([[NSItemProvider alloc] initWithItem:[nsImage TIFFRepresentation] typeIdentifier:(__bridge NSString *)kUTTypeTIFF]);
+#endif
 
         items = @[ itemProvider.get() ];
     } else if (!context.controlledSelectionData().isEmpty()) {