Commit 8a0f4c21 authored by eric@webkit.org's avatar eric@webkit.org

2009-06-24 Eric Seidel <eric@webkit.org>

        No review, build fix only.

        The previous checkin had an improper merge.  This fixes the build.

        * page/DragController.cpp:
        (WebCore::DragController::tryDocumentDrag):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45065 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3c6ea8a1
2009-06-24 Eric Seidel <eric@webkit.org>
No review, build fix only.
The previous checkin had an improper merge. This fixes the build.
* page/DragController.cpp:
(WebCore::DragController::tryDocumentDrag):
2009-06-05 Eric Seidel <eric@webkit.org>
Reviewed by Oliver Hunt.
......
......@@ -261,9 +261,9 @@ bool DragController::tryDocumentDrag(DragData* dragData, DragDestinationAction a
if (!m_documentUnderMouse)
return false;
DragOperation operation = DragOperationNone;
m_isHandlingDrag = false;
if (actionMask & DragDestinationActionDHTML) {
operation = tryDHTMLDrag(dragData);
m_isHandlingDrag = tryDHTMLDrag(dragData, operation);
// Do not continue if m_documentUnderMouse has been reset by tryDHTMLDrag.
// tryDHTMLDrag fires dragenter event. The event listener that listens
// to this event may create a nested message loop (open a modal dialog),
......@@ -272,7 +272,6 @@ bool DragController::tryDocumentDrag(DragData* dragData, DragDestinationAction a
if (!m_documentUnderMouse)
return false;
}
m_isHandlingDrag = operation != DragOperationNone;
// It's unclear why this check is after tryDHTMLDrag.
// We send drag events in tryDHTMLDrag and that may be the reason.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment