[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[dbates at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2d6e4328d9ba3e6cb93efafe4f3fdbca88706f42
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 8 06:57:28 2009 +0000

    2009-10-07  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=30188
    
            Fixes an issue where performing a non DHTML drag-and-drop operation
            does not work as expected. For instance, dragging some selected text
            to an external application, such as TextEdit.
    
            This issue was a regression that arose from patching bug #30107.
    
            This change is covered by the manual test:
            drag-out-of-background-window.html
    
            * page/DragController.cpp:
            (WebCore::DragController::startDrag): When performing a non-DHTML drag
            operation then default to drag operations DragOperationGeneric and
            DragOperationCopy according to similar functionality removed when fixing
            bug #30107, see:
            http://trac.webkit.org/browser/trunk/WebKit/mac/WebView/WebHTMLView.mm?rev=48526#L3430
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49292 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0f49441..83b2332 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2009-10-07  Daniel Bates  <dbates at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30188
+        
+        Fixes an issue where performing a non DHTML drag-and-drop operation 
+        does not work as expected. For instance, dragging some selected text 
+        to an external application, such as TextEdit.
+        
+        This issue was a regression that arose from patching bug #30107.
+        
+        This change is covered by the manual test: 
+        drag-out-of-background-window.html
+
+        * page/DragController.cpp:
+        (WebCore::DragController::startDrag): When performing a non-DHTML drag 
+        operation then default to drag operations DragOperationGeneric and 
+        DragOperationCopy according to similar functionality removed when fixing
+        bug #30107, see: 
+        http://trac.webkit.org/browser/trunk/WebKit/mac/WebView/WebHTMLView.mm?rev=48526#L3430 
+
 2009-10-07  Xan Lopez  <xlopez at igalia.com>
 
         Fix more breakage in the GTK+ build.
diff --git a/WebCore/page/DragController.cpp b/WebCore/page/DragController.cpp
index ab3a653..634595a 100644
--- a/WebCore/page/DragController.cpp
+++ b/WebCore/page/DragController.cpp
@@ -649,6 +649,12 @@ bool DragController::startDrag(Frame* src, Clipboard* clipboard, DragOperation s
 
     if (isDHTMLDrag)
         dragImage = clipboard->createDragImage(dragImageOffset);
+    else {
+        // This drag operation is not a DHTML drag and may go outside the WebView.
+        // We provide a default set of allowed drag operations that follows from:
+        // http://trac.webkit.org/browser/trunk/WebKit/mac/WebView/WebHTMLView.mm?rev=48526#L3430
+        m_sourceDragOperation = (DragOperation)(DragOperationGeneric | DragOperationCopy);
+    }
 
     // We allow DHTML/JS to set the drag image, even if its a link, image or text we're dragging.
     // This is in the spirit of the IE API, which allows overriding of pasteboard data and DragOp.

-- 
WebKit Debian packaging