Changeset 221067 in webkit

Timestamp:

Aug 22, 2017, 9:54:59 PM (9 years ago)

Author:

rniwa@webkit.org

Message:

Consolidate the code to normalize MIME type in DataTransfer
​https://bugs.webkit.org/show_bug.cgi?id=175810

Rubber-stamped by Wenson Hsieh.

Address the forgotten review comment by Wenson.

Source/WebCore:

Tests: editing/pasteboard/datatransfer-getdata-plaintext.html

• dom/DataTransfer.cpp:

(WebCore::DataTransfer::clearData):

LayoutTests:

• editing/pasteboard/datatransfer-getdata-plaintext-expected.txt:
• editing/pasteboard/datatransfer-getdata-plaintext.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/datatransfer-getdata-plaintext-expected.txt (modified) (1 diff)
• LayoutTests/editing/pasteboard/datatransfer-getdata-plaintext.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/DataTransfer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-08-22  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Consolidate the code to normalize MIME type in DataTransfer
+        https://bugs.webkit.org/show_bug.cgi?id=175810
+
+        Rubber-stamped by Wenson Hsieh.
+
+        Address the forgotten review comment by Wenson.
+
+        * editing/pasteboard/datatransfer-getdata-plaintext-expected.txt:
+        * editing/pasteboard/datatransfer-getdata-plaintext.html:
+
 2017-08-22  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/LayoutTests/editing/pasteboard/datatransfer-getdata-plaintext-expected.txt

@@ -7 +7 @@
 PASS clipboardData.setData("   tEXT/pLaIN", "world"); clipboardData.getData("text/plain") is "world"
 PASS clipboardData.setData("text/plain; charset=utf-8", "hello"); clipboardData.getData("text/plain; charset=Shift_JIS") is "hello"
+PASS clipboardData.clearData("url"); clipboardData.getData("text/plain") is "hello"
 PASS successfullyParsed is true
 

trunk/LayoutTests/editing/pasteboard/datatransfer-getdata-plaintext.html

@@ -20 +20 @@
     shouldBeEqualToString('clipboardData.setData("   tEXT/pLaIN", "world"); clipboardData.getData("text/plain")', 'world');
     shouldBeEqualToString('clipboardData.setData("text/plain; charset=utf-8", "hello"); clipboardData.getData("text/plain; charset=Shift_JIS")', 'hello');
+    shouldBeEqualToString('clipboardData.clearData("url"); clipboardData.getData("text/plain")', 'hello');
     document.getElementById('container').style.display = 'none';
     finishJSTest();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-22  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Consolidate the code to normalize MIME type in DataTransfer
+        https://bugs.webkit.org/show_bug.cgi?id=175810
+
+        Rubber-stamped by Wenson Hsieh.
+
+        Address the forgotten review comment by Wenson.
+
+        Tests: editing/pasteboard/datatransfer-getdata-plaintext.html
+
+        * dom/DataTransfer.cpp:
+        (WebCore::DataTransfer::clearData):
+
 2017-08-20  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/dom/DataTransfer.cpp

@@ -124 +124 @@
 
     String normalizedType = normalizeType(type);
-    if (type.isNull())
+    if (normalizedType.isNull())
         m_pasteboard->clear();
     else
-        m_pasteboard->clear(type);
+        m_pasteboard->clear(normalizedType);
     if (m_itemList)
-        m_itemList->didClearStringData(type);
+        m_itemList->didClearStringData(normalizedType);
 }