Changeset 45065 in webkit

Timestamp:

Jun 24, 2009 12:20:49 AM (15 years ago)

Author:

eric@webkit.org

Message:

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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DragController.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/page/DragController.cpp

@@ -262 +262 @@
         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
@@ -273 +273 @@
             return false;
     }
-    m_isHandlingDrag = operation != DragOperationNone; 
 
     // It's unclear why this check is after tryDHTMLDrag.