Changeset 130712 in webkit

Timestamp:

Oct 8, 2012 6:44:55 PM (12 years ago)

Author:

kling@webkit.org

Message:

REGRESSION(r130643): editing/pasteboard/data-transfer-item is failing on chromium.
<​http://webkit.org/b/98686>

Reviewed by Tony Chang.

Change ChromiumDataObject::createFromPasteboard() to use a ListHashSet instead of a HashSet so that
item order is preserved.

• platform/chromium/ChromiumDataObject.cpp:

(WebCore::ChromiumDataObject::createFromPasteboard):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/ChromiumDataObject.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-08  Andreas Kling  <kling@webkit.org>
+
+        REGRESSION(r130643): editing/pasteboard/data-transfer-item is failing on chromium.
+        <http://webkit.org/b/98686>
+
+        Reviewed by Tony Chang.
+
+        Change ChromiumDataObject::createFromPasteboard() to use a ListHashSet instead of a HashSet so that
+        item order is preserved.
+
+        * platform/chromium/ChromiumDataObject.cpp:
+        (WebCore::ChromiumDataObject::createFromPasteboard):
+
 2012-10-08  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/platform/chromium/ChromiumDataObject.cpp

@@ -49 +49 @@
     bool ignored;
     WebKit::WebVector<WebKit::WebString> webTypes = WebKit::Platform::current()->clipboard()->readAvailableTypes(currentPasteboardBuffer(), &ignored);
-    HashSet<String> types;
+    ListHashSet<String> types;
     for (size_t i = 0; i < webTypes.size(); ++i)
         types.add(webTypes[i]);
-    for (HashSet<String>::const_iterator it = types.begin(); it != types.end(); ++it)
+    for (ListHashSet<String>::const_iterator it = types.begin(); it != types.end(); ++it)
         dataObject->m_itemList.append(ChromiumDataObjectItem::createFromPasteboard(*it, sequenceNumber));
     return dataObject.release();