Index: third_party/WebKit/Source/core/page/DragController.cpp |
diff --git a/third_party/WebKit/Source/core/page/DragController.cpp b/third_party/WebKit/Source/core/page/DragController.cpp |
index 69f9d72e50da43e35350020dbcd8ba8e1a2cfa55..089bf467903dbf5a735b6ebdb9b8bf2b0b813f4c 100644 |
--- a/third_party/WebKit/Source/core/page/DragController.cpp |
+++ b/third_party/WebKit/Source/core/page/DragController.cpp |
@@ -730,7 +730,7 @@ bool DragController::populateDragDataTransfer(LocalFrame* src, const DragState& |
HitTestResult hitTestResult = src->eventHandler().hitTestResultAtPoint(dragOrigin); |
// FIXME: Can this even happen? I guess it's possible, but should verify |
// with a layout test. |
- if (!state.m_dragSrc->containsIncludingShadowDOM(hitTestResult.innerNode())) { |
+ if (!state.m_dragSrc->isShadowIncludingInclusiveAncestorOf(hitTestResult.innerNode())) { |
// The original node being dragged isn't under the drag origin anymore... maybe it was |
// hidden or moved out from under the cursor. Regardless, we don't want to start a drag on |
// something that's not actually under the drag origin. |
@@ -853,7 +853,7 @@ bool DragController::startDrag(LocalFrame* src, const DragState& state, const Pl |
return false; |
HitTestResult hitTestResult = src->eventHandler().hitTestResultAtPoint(dragOrigin); |
- if (!state.m_dragSrc->containsIncludingShadowDOM(hitTestResult.innerNode())) { |
+ if (!state.m_dragSrc->isShadowIncludingInclusiveAncestorOf(hitTestResult.innerNode())) { |
// The original node being dragged isn't under the drag origin anymore... maybe it was |
// hidden or moved out from under the cursor. Regardless, we don't want to start a drag on |
// something that's not actually under the drag origin. |