Title: [173914] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 173914
- Author
- [email protected]
- Date
- 2014-09-24 06:33:45 -0700 (Wed, 24 Sep 2014)
Log Message
Merge r173836 - REGRESSION(r173631): It broke the !ENABLE(VIDEO) build
https://bugs.webkit.org/show_bug.cgi?id=136946
Reviewed by Jer Noble.
No new tests required, no new functionality.
* page/DragController.cpp:
(WebCore::DragController::startDrag):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (173913 => 173914)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-24 12:59:51 UTC (rev 173913)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-24 13:33:45 UTC (rev 173914)
@@ -1,3 +1,15 @@
+2014-09-22 Eva Balazsfalvi <[email protected]>
+
+ REGRESSION(r173631): It broke the !ENABLE(VIDEO) build
+ https://bugs.webkit.org/show_bug.cgi?id=136946
+
+ Reviewed by Jer Noble.
+
+ No new tests required, no new functionality.
+
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+
2014-09-22 Mihnea Ovidenie <[email protected]>
[CSS Regions] Assertion failure and null dereference crash when using animations and regions
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/page/DragController.cpp (173913 => 173914)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/page/DragController.cpp 2014-09-24 12:59:51 UTC (rev 173913)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/page/DragController.cpp 2014-09-24 13:33:45 UTC (rev 173914)
@@ -723,7 +723,10 @@
HitTestResult hitTestResult = src.eventHandler().hitTestResultAtPoint(dragOrigin, HitTestRequest::ReadOnly | HitTestRequest::Active);
// FIXME(136836): Investigate whether all elements should use the containsIncludingShadowDOM() path here.
- bool includeShadowDOM = state.source->isMediaElement();
+ bool includeShadowDOM = false;
+#if ENABLE(VIDEO)
+ includeShadowDOM = state.source->isMediaElement();
+#endif
bool sourceContainsHitNode;
if (!includeShadowDOM)
sourceContainsHitNode = state.source->contains(hitTestResult.innerNode());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
