Title: [107917] trunk/Source/WebKit/chromium
- Revision
- 107917
- Author
- [email protected]
- Date
- 2012-02-16 02:46:20 -0800 (Thu, 16 Feb 2012)
Log Message
Build Fix: R107894 breaks Chromium Linux Build.
https://bugs.webkit.org/show_bug.cgi?id=78790
WebDragDataPrivate::types, inherited from ChromiumDataObject, returns PassRef<DOMStringList> since r107894. However, WebDragData expected to get old return value type HashSet<String>.
Patch by Yosifumi Inoue <[email protected]> on 2012-02-16
Reviewed by Kent Tamura.
* src/WebDragData.cpp:
(WebKit::WebDragData::items): Use RefPtr<DOMStringList> rather than HashSet<String> for value of m_private->types().
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (107916 => 107917)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-16 10:34:04 UTC (rev 107916)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-16 10:46:20 UTC (rev 107917)
@@ -1,3 +1,15 @@
+2012-02-16 Yosifumi Inoue <[email protected]>
+
+ Build Fix: R107894 breaks Chromium Linux Build.
+ https://bugs.webkit.org/show_bug.cgi?id=78790
+
+ WebDragDataPrivate::types, inherited from ChromiumDataObject, returns PassRef<DOMStringList> since r107894. However, WebDragData expected to get old return value type HashSet<String>.
+
+ Reviewed by Kent Tamura.
+
+ * src/WebDragData.cpp:
+ (WebKit::WebDragData::items): Use RefPtr<DOMStringList> rather than HashSet<String> for value of m_private->types().
+
2012-02-15 Sami Kyostila <[email protected]>
Enable -webkit-overflow-scrolling CSS property
Modified: trunk/Source/WebKit/chromium/src/WebDragData.cpp (107916 => 107917)
--- trunk/Source/WebKit/chromium/src/WebDragData.cpp 2012-02-16 10:34:04 UTC (rev 107916)
+++ trunk/Source/WebKit/chromium/src/WebDragData.cpp 2012-02-16 10:46:20 UTC (rev 107917)
@@ -69,8 +69,8 @@
WebVector<WebDragData::Item> WebDragData::items() const
{
Vector<Item> itemList;
- const HashSet<String>& types = m_private->types();
- if (types.contains(mimeTypeTextPlain)) {
+ RefPtr<DOMStringList> types = m_private->types();
+ if (types->contains(mimeTypeTextPlain)) {
Item item;
item.storageType = Item::StorageTypeString;
item.stringType = String(mimeTypeTextPlain);
@@ -78,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);
@@ -87,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);
@@ -96,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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
