Changeset 53270 in webkit

Timestamp:

Jan 14, 2010 10:23:18 AM (14 years ago)

Author:

bweinstein@apple.com

Message:

[DnD] effectAllowed and dropEffect can be set to bogus values.
Fixes <​https://bugs.webkit.org/show_bug.cgi?id=33635>.

Reviewed by Oliver Hunt.

WebCore:

Test to make aure dropEffect and effectAllowed are being set to valid values
when they are being set (list of valid values given by HTML5 specification).

Also, drive by change to initialize dropEffect to none (as described in spec).

Test: fast/events/bogus-dropEffect-effectAllowed.html

• dom/Clipboard.cpp:

(WebCore::Clipboard::Clipboard): Initialize m_dropEffect to "none".
(WebCore::Clipboard::setDropEffect): Check if dropEffect is being set to a valid value.
(WebCore::Clipboard::setEffectAllowed): Check if effectAllowed is being set to a valid value.

LayoutTests:

Added a test to check the handling of setting effectAllowed and
dropEffect to bogus values (that it gets ignored), and updated results
to drag-and-drop because it uses a dummy value.

• fast/events/bogus-dropEffect-effectAllowed-expected.txt: Added.
• fast/events/bogus-dropEffect-effectAllowed.html: Added.
• fast/events/drag-and-drop-expected.txt:
• fast/events/drag-and-drop.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/bogus-dropEffect-effectAllowed-expected.txt (added)
• LayoutTests/fast/events/bogus-dropEffect-effectAllowed.html (added)
• LayoutTests/fast/events/drag-and-drop-expected.txt (modified) (1 diff)
• LayoutTests/fast/events/drag-and-drop.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Clipboard.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-14  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        [DnD] effectAllowed and dropEffect can be set to bogus values.
+        Fixes <https://bugs.webkit.org/show_bug.cgi?id=33635>.
+        
+        Added a test to check the handling of setting effectAllowed and
+        dropEffect to bogus values (that it gets ignored), and updated results
+        to drag-and-drop because it uses a dummy value.
+
+        * fast/events/bogus-dropEffect-effectAllowed-expected.txt: Added.
+        * fast/events/bogus-dropEffect-effectAllowed.html: Added.
+        * fast/events/drag-and-drop-expected.txt:
+        * fast/events/drag-and-drop.html:
+
 2010-01-14  Adam Roben  <aroben@apple.com>
 

trunk/LayoutTests/fast/events/drag-and-drop-expected.txt

@@ -93 +93 @@
 When effectAllowed == "dummy"
 
+PASS event.dataTransfer.effectAllowed is "uninitialized"
 PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is "none"
+PASS event.dataTransfer.effectAllowed is "uninitialized"
+PASS event.dataTransfer.dropEffect is "copy"
+PASS event.dataTransfer.effectAllowed is "uninitialized"
+PASS event.dataTransfer.dropEffect is "move"
+PASS event.dataTransfer.effectAllowed is "uninitialized"
+PASS event.dataTransfer.dropEffect is "link"
+PASS event.dataTransfer.effectAllowed is "uninitialized"
 PASS event.dataTransfer.dropEffect is "none"
 

trunk/LayoutTests/fast/events/drag-and-drop.html

@@ -93 +93 @@
         if (chosenEffectAllowed === "undefined") {
             // If no effectAllowed is set, we should default to uninitialized. Make sure that's the case.
+            shouldBeEqualToString("event.dataTransfer.effectAllowed", "uninitialized");
+            
+            // Then set the chosenEffectAllowed so isDropEffectAllowed matches the HTML5 spec, and
+            // doesn't need special cases for undefined.
+            chosenEffectAllowed = "uninitialized";
+        }
+        
+        if (chosenEffectAllowed === "dummy") {
+            // If a bad effectAllowed is attempted to be set, it should never be set, and the
+            // effectAllowed should be uninitialized.
             shouldBeEqualToString("event.dataTransfer.effectAllowed", "uninitialized");
             

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-14  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        [DnD] effectAllowed and dropEffect can be set to bogus values.
+        Fixes <https://bugs.webkit.org/show_bug.cgi?id=33635>.
+        
+        Test to make aure dropEffect and effectAllowed are being set to valid values
+        when they are being set (list of valid values given by HTML5 specification).
+        
+        Also, drive by change to initialize dropEffect to none (as described in spec).
+
+        Test: fast/events/bogus-dropEffect-effectAllowed.html
+
+        * dom/Clipboard.cpp:
+        (WebCore::Clipboard::Clipboard): Initialize m_dropEffect to "none".
+        (WebCore::Clipboard::setDropEffect): Check if dropEffect is being set to a valid value.
+        (WebCore::Clipboard::setEffectAllowed): Check if effectAllowed is being set to a valid value.
+
 2010-01-14  Martin Robinson  <martin.james.robinson@gmail.com>
 

trunk/WebCore/dom/Clipboard.cpp

@@ -36 +36 @@
 
 Clipboard::Clipboard(ClipboardAccessPolicy policy, bool isForDragging) 
-    : m_policy(policy) 
+    : m_policy(policy)
+    , m_dropEffect("none")
     , m_effectAllowed("uninitialized")
     , m_dragStarted(false)
@@ -131 +132 @@
         return;
 
+    // The attribute must ignore any attempts to set it to a value other than none, copy, link, and move. 
+    if (effect != "none" && effect != "copy"  && effect != "link" && effect != "move")
+        return;
+
     if (m_policy == ClipboardReadable || m_policy == ClipboardTypesReadable)
         m_dropEffect = effect;
@@ -140 +145 @@
         return;
 
+    if (dragOpFromIEOp(effect) == DragOperationPrivate) {
+        // This means that there was no conversion, and the effectAllowed that
+        // we are passed isn't a valid effectAllowed, so we should ignore it,
+        // and not set m_effectAllowed.
+
+        // The attribute must ignore any attempts to set it to a value other than 
+        // none, copy, copyLink, copyMove, link, linkMove, move, all, and uninitialized.
+        return;
+    }
+
+
     if (m_policy == ClipboardWritable)
         m_effectAllowed = effect;