Title: [174841] trunk/Source/WebKit/mac
- Revision
- 174841
- Author
- [email protected]
- Date
- 2014-10-17 14:52:39 -0700 (Fri, 17 Oct 2014)
Log Message
Build fix for 32-bit Yosemite
* WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::contextMenuForEvent):
Avoid using NSItemProvider in 32-bit, because it doesn't exist.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (174840 => 174841)
--- trunk/Source/WebKit/mac/ChangeLog 2014-10-17 21:25:10 UTC (rev 174840)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-10-17 21:52:39 UTC (rev 174841)
@@ -1,3 +1,11 @@
+2014-10-17 Tim Horton <[email protected]>
+
+ 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 <[email protected]>
Use is<>() / downcast<>() for RenderBox
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (174840 => 174841)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-10-17 21:25:10 UTC (rev 174840)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-10-17 21:52:39 UTC (rev 174841)
@@ -482,7 +482,7 @@
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());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
