Changeset 53410 in webkit

Timestamp:

Jan 18, 2010 9:20:01 AM (14 years ago)

Author:

Adam Roben

Message:

DataTransfer interface broken on Windows--types member is always undefined, and getData() does not work.

​https://bugs.webkit.org/show_bug.cgi?id=30527

Patch by Daniel Cheng <​dcheng@google.com> on 2010-01-18
Reviewed by Adam Roben.

WebCore:

• platform/win/ClipboardWin.cpp:

(WebCore::addMimeTypesForFormat): pass FORMATETC as a const ref.
(WebCore::ClipboardWin::types): fix calls to IEnumFORMATETC.
(WebCore::ClipboardWin::hasData): fix calls to IEnumFORMATETC.

LayoutTests:

• fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt: Updated test expectations.
• fast/events/drag-and-drop-dataTransfer-types-nocrash.html: Added test cases.
• platform/win/Skipped: Re-enabled fast/events/drag-and-drop-dataTransfer-types-nocrash.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt (modified) (1 diff)
• LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/win/ClipboardWin.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-18  Daniel Cheng  <dcheng@google.com>
+
+        Reviewed by Adam Roben
+
+        DataTransfer interface broken on Windows--types member is always
+        undefined, and getData() does not work.
+        https://bugs.webkit.org/show_bug.cgi?id=30527
+
+        * fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt: Updated test expectations.
+        * fast/events/drag-and-drop-dataTransfer-types-nocrash.html: Added test cases.
+        * platform/win/Skipped: Re-enabled fast/events/drag-and-drop-dataTransfer-types-nocrash.html
+
 2010-01-17  Csaba Osztrogonác  <ossy@webkit.org>
 

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

@@ -5 +5 @@
 
 PASS event.dataTransfer.types contains format "text/plain"
+PASS event.dataTransfer.getData("text/plain") contains "Square"
 
 TEST COMPLETE

trunk/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html

@@ -90 +90 @@
         else
             testPassed('event.dataTransfer.types contains format "' + FORMAT_TYPE + '"');
+
+        if (event.dataTransfer.getData(FORMAT_TYPE) != 'Square')
+            testFailed('event.dataTransfer.getData("' + FORMAT_TYPE + '") should contain "Square", but it does not.');
+        else
+            testPassed('event.dataTransfer.getData("' + FORMAT_TYPE + '") contains "Square"');
     }
 

trunk/LayoutTests/platform/win/Skipped

@@ -109 +109 @@
 fast/events/drag-in-frames.html
 fast/events/standalone-image-drag-to-editable.html
-
-# Event.dataTransfer.types does not behave correctly (https://bugs.webkit.org/show_bug.cgi?id=30527)
-fast/events/drag-and-drop-dataTransfer-types-nocrash.html
 
 # <rdar://problem/5643675> window.scrollTo scrolls a window with no scrollbars

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-18  Daniel Cheng  <dcheng@google.com>
+
+        Reviewed by Adam Roben.
+
+        DataTransfer interface broken on Windows--types member is always
+        undefined, and getData() does not work.
+        https://bugs.webkit.org/show_bug.cgi?id=30527
+
+        * platform/win/ClipboardWin.cpp:
+        (WebCore::addMimeTypesForFormat): pass FORMATETC as a const ref.
+        (WebCore::ClipboardWin::types): fix calls to IEnumFORMATETC.
+        (WebCore::ClipboardWin::hasData): fix calls to IEnumFORMATETC.
+
 2010-01-18  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/WebCore/platform/win/ClipboardWin.cpp

@@ -535 +535 @@
 }
 
-static void addMimeTypesForFormat(HashSet<String>& results, FORMATETC& format)
+static void addMimeTypesForFormat(HashSet<String>& results, const FORMATETC& format)
 {
     // URL and Text are provided for compatibility with IE's model
@@ -561 +561 @@
     COMPtr<IEnumFORMATETC> itr;
 
-    if (FAILED(m_dataObject->EnumFormatEtc(0, &itr)))
+    if (FAILED(m_dataObject->EnumFormatEtc(DATADIR_GET, &itr)))
         return results;
 
@@ -569 +569 @@
     FORMATETC data;
 
-    while (SUCCEEDED(itr->Next(1, &data, 0))) {
+    // IEnumFORMATETC::Next returns S_FALSE if there are no more items.
+    while (itr->Next(1, &data, 0) == S_OK) {
         addMimeTypesForFormat(results, data);
     }
@@ -782 +783 @@
 
     COMPtr<IEnumFORMATETC> itr;
-    if (FAILED(m_dataObject->EnumFormatEtc(0, &itr)))
+    if (FAILED(m_dataObject->EnumFormatEtc(DATADIR_GET, &itr)))
         return false;
 
@@ -790 +791 @@
     FORMATETC data;
 
-    if (SUCCEEDED(itr->Next(1, &data, 0))) {
+    // IEnumFORMATETC::Next returns S_FALSE if there are no more items.
+    if (itr->Next(1, &data, 0) == S_OK) {
         // There is at least one item in the IDataObject
         return true;