Fix http://bugs.webkit.org/show_bug.cgi?id=16816 , rdar://problem/5682985

Reviewed by Mitz

Correctly trigger willPerformDragDestinationAction when a drop causes a
load to occur.  The logic that originally did this was lost during the
great drag migration of '07.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ba3c2b6..aedf2be 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2008-01-20  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Mitz.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=16816 , rdar://problem/5682985
+        
+        Correctly trigger willPerformDragDestinationAction when a drop causes a 
+        load to occur.  The logic that originally did this was lost during the
+        great drag migration of '07.
+
+        * page/DragController.cpp:
+        (WebCore::DragController::performDrag):
+

 2008-01-20  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Darin Adler.
 2008-01-20  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/WebCore/page/DragController.cpp b/WebCore/page/DragController.cpp
index ecca5e7..ebbbfea 100644 (file)
--- a/WebCore/page/DragController.cpp
+++ b/WebCore/page/DragController.cpp
@@ -200,7 +200,8 @@ bool DragController::performDrag(DragData* dragData)
 
     if (operationForLoad(dragData) == DragOperationNone)
         return false;
 
     if (operationForLoad(dragData) == DragOperationNone)
         return false;

-      
+
+    m_client->willPerformDragDestinationAction(DragDestinationActionLoad, dragData);

     m_page->mainFrame()->loader()->load(ResourceRequest(dragData->asURL()));
     return true;
 }
     m_page->mainFrame()->loader()->load(ResourceRequest(dragData->asURL()));
     return true;
 }