[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit a421f488590efcdb06281649ee0762b75f68364c
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 01:17:44 2010 +0000

    Rubber-stamped by Oliver Hunt.
    
    Fix an assertion that was causing test crashes. Filed a bug
    about the weirdness that causes this assertion (inconsistencies
    between DragOperationMove and DragOperationGeneric).
    
    * dom/Clipboard.cpp:
    (WebCore::dragOpFromIEOp):
    (WebCore::Clipboard::setDestinationOperation):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53301 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0ce11db..b668ac7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-14  Brian Weinstein  <bweinstein at apple.com>
+
+        Rubber-stamped by Oliver Hunt.
+
+        Fix an assertion that was causing test crashes. Filed a bug
+        about the weirdness that causes this assertion (inconsistencies 
+        between DragOperationMove and DragOperationGeneric).
+
+        * dom/Clipboard.cpp:
+        (WebCore::dragOpFromIEOp):
+        (WebCore::Clipboard::setDestinationOperation):
+
 2010-01-14  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/dom/Clipboard.cpp b/WebCore/dom/Clipboard.cpp
index 4d8fa96..7f33aac 100644
--- a/WebCore/dom/Clipboard.cpp
+++ b/WebCore/dom/Clipboard.cpp
@@ -66,7 +66,7 @@ static DragOperation dragOpFromIEOp(const String& op)
     if (op == "link")
         return DragOperationLink;
     if (op == "move")
-        return DragOperationGeneric;
+        return DragOperationGeneric;    // FIXME: Why is this DragOperationGeneric? <http://webkit.org/b/33697>
     if (op == "copyLink")
         return (DragOperation)(DragOperationCopy | DragOperationLink);
     if (op == "copyMove")
@@ -110,7 +110,7 @@ DragOperation Clipboard::sourceOperation() const
 DragOperation Clipboard::destinationOperation() const
 {
     DragOperation op = dragOpFromIEOp(m_dropEffect);
-    ASSERT_ARG(op, op == DragOperationCopy || op == DragOperationNone || op == DragOperationLink || op == DragOperationGeneric);
+    ASSERT(op == DragOperationCopy || op == DragOperationNone || op == DragOperationLink || op == DragOperationGeneric || op == DragOperationMove);
     return op;
 }
 
@@ -122,7 +122,7 @@ void Clipboard::setSourceOperation(DragOperation op)
 
 void Clipboard::setDestinationOperation(DragOperation op)
 {
-    ASSERT(op == DragOperationCopy || op == DragOperationNone || op == DragOperationLink || op == DragOperationMove);
+    ASSERT_ARG(op, op == DragOperationCopy || op == DragOperationNone || op == DragOperationLink || op == DragOperationGeneric || op == DragOperationMove);
     m_dropEffect = IEOpFromDragOp(op);
 }
 

-- 
WebKit Debian packaging