Build fix for 32-bit Yosemite
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Oct 2014 21:52:39 +0000 (21:52 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Oct 2014 21:52:39 +0000 (21:52 +0000)
* WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::contextMenuForEvent):
Avoid using NSItemProvider in 32-bit, because it doesn't exist.

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

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm

index e7e6fc06c0f866958831914571896e929367c0c5..e7fa1165c80cf9a8930b2d49bfa564e190d94f24 100644 (file)
@@ -1,3 +1,11 @@
+2014-10-17  Tim Horton  <timothy_horton@apple.com>
+
+        Build fix for 32-bit Yosemite
+
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (WebContextMenuClient::contextMenuForEvent):
+        Avoid using NSItemProvider in 32-bit, because it doesn't exist.
+
 2014-10-17  Chris Dumez  <cdumez@apple.com>
 
         Use is<>() / downcast<>() for RenderBox
index 2671e36f0784d8fd59a9bd60c8a22e439b452e8f..2faf896d6770b92844bc77ebc9c5c9dbc0596369 100644 (file)
@@ -482,7 +482,7 @@ NSMenu *WebContextMenuClient::contextMenuForEvent(NSEvent *event, NSView *view,
     if (!page)
         return nil;
 
-#if ENABLE(SERVICE_CONTROLS)
+#if ENABLE(SERVICE_CONTROLS) && defined(__LP64__)
     if (Image* image = page->contextMenuController().context().controlledImage()) {
         ASSERT(page->contextMenuController().context().hitTestResult().innerNode());