Changeset 48899 in webkit

Timestamp:

Sep 29, 2009 2:01:39 PM (15 years ago)

Author:

dbates@webkit.org

Message:

2009-09-29 Daniel Bates <​dbates@webkit.org>

Reviewed by Adam Roben.

​https://bugs.webkit.org/show_bug.cgi?id=28902

Fixes an issue where the drop effect returned by Window Dump Render Tree
was always DROPEFFECT_NONE (since it was hard coded to do so).

This patch corrects this issue by determining the actual drop effect
performed by the corresponding drag-and-drop operation so that we can
return it.

• DumpRenderTree/win/DraggingInfo.h: Added field m_dropEffect to store performed drop effect. (DraggingInfo::DraggingInfo): (DraggingInfo::performedDropEffect): Added method. (DraggingInfo::setPerformedDropEffect): Added method.
• DumpRenderTree/win/EventSender.cpp: (doMouseUp): Calls method DraggingInfo::setPerformedDropEffect with performed drop effect. Moved delete draggingInfo to UIDelegate::doDragDrop.
• DumpRenderTree/win/UIDelegate.cpp: (UIDelegate::doDragDrop): Sets performedDropEffect to DraggingInfo::performedDropEffect().

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/win/DraggingInfo.h (modified) (2 diffs)
• DumpRenderTree/win/EventSender.cpp (modified) (1 diff)
• DumpRenderTree/win/UIDelegate.cpp (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-09-29  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28902
+        
+        Fixes an issue where the drop effect returned by Window Dump Render Tree 
+        was always DROPEFFECT_NONE (since it was hard coded to do so).
+        
+        This patch corrects this issue by determining the actual drop effect 
+        performed by the corresponding drag-and-drop operation so that we can 
+        return it.
+
+        * DumpRenderTree/win/DraggingInfo.h: Added field m_dropEffect to store performed drop effect.
+        (DraggingInfo::DraggingInfo):
+        (DraggingInfo::performedDropEffect): Added method.
+        (DraggingInfo::setPerformedDropEffect): Added method.
+        * DumpRenderTree/win/EventSender.cpp:
+        (doMouseUp): Calls method DraggingInfo::setPerformedDropEffect with performed drop effect.
+        Moved delete draggingInfo to UIDelegate::doDragDrop.
+        * DumpRenderTree/win/UIDelegate.cpp:
+        (UIDelegate::doDragDrop): Sets performedDropEffect to DraggingInfo::performedDropEffect().
+
 2009-09-29  Dan Bernstein  <mitz@apple.com>
 

trunk/WebKitTools/DumpRenderTree/win/DraggingInfo.h

@@ -37 +37 @@
         : m_object(object)
         , m_source(source)
+        , m_performedDropEffect(DROPEFFECT_NONE)
     {
         m_object->AddRef();
@@ -55 +56 @@
     IDropSource* dropSource() const { return m_source; }
 
+    DWORD performedDropEffect() const { return m_performedDropEffect; }
+    void setPerformedDropEffect(DWORD effect) { m_performedDropEffect = effect; }
+
 private:
     IDataObject* m_object;
     IDropSource* m_source;
+    DWORD m_performedDropEffect;
 };
 

trunk/WebKitTools/DumpRenderTree/win/EventSender.cpp

@@ -220 +220 @@
                 DWORD effect = 0;
                 webViewDropTarget->Drop(draggingInfo->dataObject(), 0, pointl(screenPoint), &effect);
+                draggingInfo->setPerformedDropEffect(effect);
             } else
                 webViewDropTarget->DragLeave();
 
-            delete draggingInfo;
-            draggingInfo = 0;
+            // Reset didDragEnter so that another drag started within the same frame works properly.
+            didDragEnter = false;
         }
     }

trunk/WebKitTools/DumpRenderTree/win/UIDelegate.cpp

@@ -504 +504 @@
     draggingInfo = new DraggingInfo(object, source);
     replaySavedEvents();
+    if (draggingInfo) {
+        *performedEffect = draggingInfo->performedDropEffect();
+        delete draggingInfo;
+        draggingInfo = 0;
+    }
     return S_OK;
 }