Title: [175304] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 175304
- Author
- [email protected]
- Date
- 2014-10-28 21:32:27 -0700 (Tue, 28 Oct 2014)
Log Message
Merge r174841. <rdar://problem/18753175>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175303 => 175304)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 04:28:57 UTC (rev 175303)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 04:32:27 UTC (rev 175304)
@@ -1,5 +1,17 @@
2014-10-28 Dana Burkart <[email protected]>
+ Merge r174841. <rdar://problem/18753175>
+
+ 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-28 Dana Burkart <[email protected]>
+
Merge r174837. <rdar://problem/18753175>
2014-10-17 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (175303 => 175304)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-10-29 04:28:57 UTC (rev 175303)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-10-29 04:32:27 UTC (rev 175304)
@@ -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
