[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 1543cd6996c0e457143b088f5c75c37ac25e5a7b
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 21:16:21 2010 +0000

    Follow up to <https://bugs.webkit.org/show_bug.cgi?id=33635>.
    
    Reviewed by Adam Roben.
    
    Now that dropEffect and effectAllowed are guaranteed to not be
    null, change null checks into asserts to make sure we are returning
    a proper DragOperation value.
    
    * dom/Clipboard.cpp:
    (WebCore::Clipboard::sourceOperation): Change null check to assert.
    (WebCore::Clipboard::destinationOperation): Ditto.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f8fb127..0763a9d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,19 @@
 2010-01-14  Brian Weinstein  <bweinstein at apple.com>
 
+        Reviewed by Adam Roben.
+
+        Follow up to <https://bugs.webkit.org/show_bug.cgi?id=33635>.
+        
+        Now that dropEffect and effectAllowed are guaranteed to not be
+        null, change null checks into asserts to make sure we are returning
+        a proper DragOperation value.
+
+        * dom/Clipboard.cpp:
+        (WebCore::Clipboard::sourceOperation): Change null check to assert.
+        (WebCore::Clipboard::destinationOperation): Ditto.
+
+2010-01-14  Brian Weinstein  <bweinstein at apple.com>
+
         Reviewed by Oliver Hunt.
 
         [DnD] effectAllowed and dropEffect can be set to bogus values.
diff --git a/WebCore/dom/Clipboard.cpp b/WebCore/dom/Clipboard.cpp
index 2a0386f..64c70d0 100644
--- a/WebCore/dom/Clipboard.cpp
+++ b/WebCore/dom/Clipboard.cpp
@@ -102,17 +102,15 @@ static String IEOpFromDragOp(DragOperation op)
 
 bool Clipboard::sourceOperation(DragOperation& op) const
 {
-    if (m_effectAllowed.isNull())
-        return false;
     op = dragOpFromIEOp(m_effectAllowed);
+    ASSERT(op != DragOperationPrivate);
     return true;
 }
 
 bool Clipboard::destinationOperation(DragOperation& op) const
 {
-    if (m_dropEffect.isNull())
-        return false;
     op = dragOpFromIEOp(m_dropEffect);
+    ASSERT(op == DragOperationCopy || op == DragOperationNone || op == DragOperationLink || op == DragOperationMove);
     return true;
 }
 

-- 
WebKit Debian packaging