Attachment 40213 Details for Bug 28902 – Patch

[patch] Patch

Bug28902_2.patch (text/plain), 3.76 KB, created by Daniel Bates on 2009-09-27 20:43:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2009-09-27 20:43:17 PDT

Size: 3.76 KB

patch

obsolete

>Index: WebKitTools/ChangeLog
>===================================================================
>--- WebKitTools/ChangeLog	(revision 48794)
>+++ WebKitTools/ChangeLog	(working copy)
>@@ -1,3 +1,26 @@
>+2009-09-27  Daniel Bates  <dbates@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-26  David Kilzer  <ddkilzer@apple.com>
> 
>         <http://webkit.org/b/29764> mark-bug-fixed: add -o|--open switch
>Index: WebKitTools/DumpRenderTree/win/DraggingInfo.h
>===================================================================
>--- WebKitTools/DumpRenderTree/win/DraggingInfo.h	(revision 48794)
>+++ WebKitTools/DumpRenderTree/win/DraggingInfo.h	(working copy)
>@@ -36,6 +36,7 @@ public:
>     DraggingInfo(IDataObject* object, IDropSource* source)
>         : m_object(object)
>         , m_source(source)
>+        , m_performedDropEffect(DROPEFFECT_NONE)
>     {
>         m_object->AddRef();
>         m_source->AddRef();
>@@ -54,9 +55,13 @@ public:
>     IDataObject* dataObject() const { return m_object; }
>     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;
> };
> 
> #endif // !defined(DraggingInfo_h)
>Index: WebKitTools/DumpRenderTree/win/EventSender.cpp
>===================================================================
>--- WebKitTools/DumpRenderTree/win/EventSender.cpp	(revision 48794)
>+++ WebKitTools/DumpRenderTree/win/EventSender.cpp	(working copy)
>@@ -219,11 +219,12 @@ static void doMouseUp(MSG msg)
>             if (hr == DRAGDROP_S_DROP && effect != DROPEFFECT_NONE) {
>                 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;
>         }
>     }
> }
>Index: WebKitTools/DumpRenderTree/win/UIDelegate.cpp
>===================================================================
>--- WebKitTools/DumpRenderTree/win/UIDelegate.cpp	(revision 48794)
>+++ WebKitTools/DumpRenderTree/win/UIDelegate.cpp	(working copy)
>@@ -503,6 +503,11 @@ HRESULT STDMETHODCALLTYPE UIDelegate::do
> 
>     draggingInfo = new DraggingInfo(object, source);
>     replaySavedEvents();
>+    if (draggingInfo) {
>+        *performedEffect = draggingInfo->performedDropEffect();
>+        delete draggingInfo;
>+        draggingInfo = 0;
>+    }
>     return S_OK;
> }
>

Flags:

aroben: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 28902: 40183 | 40184 | 40213