[webkit-changes] [109189] trunk/Source/WebKit/chromium

[dcheng]

Title: [109189] trunk/Source/WebKit/chromium

Revision

109189

Author

dch...@chromium.org

Date

2012-02-28 21:35:25 -0800 (Tue, 28 Feb 2012)

Log Message

Unreviewed, rolling out r107917 and r109188.
http://trac.webkit.org/changeset/107917
http://trac.webkit.org/changeset/109188
https://bugs.webkit.org/show_bug.cgi?id=79865

Fix the chromium build. (Requested by dcheng on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-02-28

* src/WebDragData.cpp:
(WebKit::WebDragData::items):

Modified Paths

• trunk/Source/WebKit/chromium/ChangeLog
• trunk/Source/WebKit/chromium/src/WebDragData.cpp

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (109188 => 109189)

--- trunk/Source/WebKit/chromium/ChangeLog	2012-02-29 05:16:22 UTC (rev 109188)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-02-29 05:35:25 UTC (rev 109189)
@@ -1,3 +1,15 @@
+2012-02-28  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r107917 and r109188.
+        http://trac.webkit.org/changeset/107917
+        http://trac.webkit.org/changeset/109188
+        https://bugs.webkit.org/show_bug.cgi?id=79865
+
+        Fix the chromium build. (Requested by dcheng on #webkit).
+
+        * src/WebDragData.cpp:
+        (WebKit::WebDragData::items):
+
 2012-02-28  Ryosuke Niwa  <rn...@webkit.org>
 
         Chromium build fix attempt.

Modified: trunk/Source/WebKit/chromium/src/WebDragData.cpp (109188 => 109189)

--- trunk/Source/WebKit/chromium/src/WebDragData.cpp	2012-02-29 05:16:22 UTC (rev 109188)
+++ trunk/Source/WebKit/chromium/src/WebDragData.cpp	2012-02-29 05:35:25 UTC (rev 109189)
@@ -33,7 +33,6 @@
 
 #include "ChromiumDataObject.h"
 #include "ClipboardMimeTypes.h"
-#include "DOMStringList.h"
 #include "platform/WebData.h"
 #include "platform/WebString.h"
 #include "platform/WebURL.h"
@@ -70,8 +69,8 @@
 WebVector<WebDragData::Item> WebDragData::items() const
 {
     Vector<Item> itemList;
-    RefPtr<DOMStringList> types = m_private->types();
-    if (types->contains(mimeTypeTextPlain)) {
+    const HashSet<String>& types = m_private->types();
+    if (types.contains(mimeTypeTextPlain)) {
         Item item;
         item.storageType = Item::StorageTypeString;
         item.stringType = String(mimeTypeTextPlain);
@@ -79,7 +78,7 @@
         item.stringData = m_private->getData(mimeTypeTextPlain, ignored);
         itemList.append(item);
     }
-    if (types->contains(mimeTypeTextURIList)) {
+    if (types.contains(mimeTypeTextURIList)) {
         Item item;
         item.storageType = Item::StorageTypeString;
         item.stringType = String(mimeTypeTextURIList);
@@ -88,7 +87,7 @@
         item.title = m_private->urlTitle();
         itemList.append(item);
     }
-    if (types->contains(mimeTypeTextHTML)) {
+    if (types.contains(mimeTypeTextHTML)) {
         Item item;
         item.storageType = Item::StorageTypeString;
         item.stringType = String(mimeTypeTextHTML);
@@ -97,7 +96,7 @@
         item.baseURL = m_private->htmlBaseUrl();
         itemList.append(item);
     }
-    if (types->contains(mimeTypeDownloadURL)) {
+    if (types.contains(mimeTypeDownloadURL)) {
         Item item;
         item.storageType = Item::StorageTypeString;
         item.stringType = String(mimeTypeDownloadURL);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes