Diff
Modified: trunk/Source/WebCore/ChangeLog (142169 => 142170)
--- trunk/Source/WebCore/ChangeLog 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/ChangeLog 2013-02-07 21:26:41 UTC (rev 142170)
@@ -1,3 +1,52 @@
+2013-02-07 Gavin Peters <[email protected]>
+
+ Unreviewed, rolling out r142155.
+ http://trac.webkit.org/changeset/142155
+ https://bugs.webkit.org/show_bug.cgi?id=82888
+
+ cr/win build broke.
+
+ * bindings/js/JSClipboardCustom.cpp:
+ (WebCore::JSClipboard::types):
+ * bindings/v8/custom/V8ClipboardCustom.cpp:
+ (WebCore::V8Clipboard::typesAccessorGetter):
+ * dom/Clipboard.h:
+ (Clipboard):
+ * platform/blackberry/ClipboardBlackBerry.cpp:
+ (WebCore::ClipboardBlackBerry::types):
+ * platform/blackberry/ClipboardBlackBerry.h:
+ (ClipboardBlackBerry):
+ * platform/chromium/ChromiumDataObject.cpp:
+ (WebCore::ChromiumDataObject::types):
+ * platform/chromium/ChromiumDataObject.h:
+ (ChromiumDataObject):
+ * platform/chromium/ClipboardChromium.cpp:
+ (WebCore::ClipboardChromium::types):
+ * platform/chromium/ClipboardChromium.h:
+ (ClipboardChromium):
+ * platform/efl/ClipboardEfl.cpp:
+ (WebCore::ClipboardEfl::types):
+ * platform/efl/ClipboardEfl.h:
+ (ClipboardEfl):
+ * platform/gtk/ClipboardGtk.cpp:
+ (WebCore::ClipboardGtk::types):
+ * platform/gtk/ClipboardGtk.h:
+ (ClipboardGtk):
+ * platform/mac/ClipboardMac.h:
+ (ClipboardMac):
+ * platform/mac/ClipboardMac.mm:
+ (WebCore::addHTMLClipboardTypesForCocoaType):
+ (WebCore::ClipboardMac::types):
+ * platform/qt/ClipboardQt.cpp:
+ (WebCore::ClipboardQt::types):
+ * platform/qt/ClipboardQt.h:
+ (ClipboardQt):
+ * platform/win/ClipboardWin.cpp:
+ (WebCore::addMimeTypesForFormat):
+ (WebCore::ClipboardWin::types):
+ * platform/win/ClipboardWin.h:
+ (ClipboardWin):
+
2013-02-07 Rik Cabanier <[email protected]>
Add support for parsing of -webkit-background-blend-mode
Modified: trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp (142169 => 142170)
--- trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp 2013-02-07 21:26:41 UTC (rev 142170)
@@ -51,13 +51,13 @@
{
Clipboard* clipboard = impl();
- Vector<String> types = clipboard->types();
+ ListHashSet<String> types = clipboard->types();
if (types.isEmpty())
return jsNull();
MarkedArgumentBuffer list;
- Vector<String>::const_iterator end = types.end();
- for (Vector<String>::const_iterator it = types.begin(); it != end; ++it)
+ ListHashSet<String>::const_iterator end = types.end();
+ for (ListHashSet<String>::const_iterator it = types.begin(); it != end; ++it)
list.append(jsStringWithCache(exec, *it));
return constructArray(exec, 0, globalObject(), list);
}
Modified: trunk/Source/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp (142169 => 142170)
--- trunk/Source/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp 2013-02-07 21:26:41 UTC (rev 142170)
@@ -47,14 +47,14 @@
{
Clipboard* clipboard = V8Clipboard::toNative(info.Holder());
- Vector<String> types = clipboard->types();
+ ListHashSet<String> types = clipboard->types();
if (types.isEmpty())
return v8Null(info.GetIsolate());
v8::Local<v8::Array> result = v8::Array::New(types.size());
- Vector<String>::const_iterator end = types.end();
+ ListHashSet<String>::const_iterator end = types.end();
int index = 0;
- for (Vector<String>::const_iterator it = types.begin(); it != end; ++it, ++index)
+ for (ListHashSet<String>::const_iterator it = types.begin(); it != end; ++it, ++index)
result->Set(v8Integer(index, info.GetIsolate()), v8String(*it, info.GetIsolate()));
return result;
Modified: trunk/Source/WebCore/dom/Clipboard.h (142169 => 142170)
--- trunk/Source/WebCore/dom/Clipboard.h 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/dom/Clipboard.h 2013-02-07 21:26:41 UTC (rev 142170)
@@ -66,7 +66,7 @@
virtual bool setData(const String& type, const String& data) = 0;
// extensions beyond IE's API
- virtual Vector<String> types() const = 0;
+ virtual ListHashSet<String> types() const = 0;
virtual PassRefPtr<FileList> files() const = 0;
IntPoint dragLocation() const { return m_dragLoc; }
Modified: trunk/Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp (142169 => 142170)
--- trunk/Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp 2013-02-07 21:26:41 UTC (rev 142170)
@@ -78,16 +78,16 @@
return true;
}
-Vector<String> ClipboardBlackBerry::types() const
+ListHashSet<String> ClipboardBlackBerry::types() const
{
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
- return Vector<String>();
+ return ListHashSet<String>();
// We use hardcoded list here since there seems to be no API to get the list.
- Vector<String> ret;
- ret.append(ASCIILiteral("text/plain"));
- ret.append(ASCIILiteral("text/html"));
- ret.append(ASCIILiteral("text/url"));
+ ListHashSet<String> ret;
+ ret.add("text/plain");
+ ret.add("text/html");
+ ret.add("text/url");
return ret;
}
Modified: trunk/Source/WebCore/platform/blackberry/ClipboardBlackBerry.h (142169 => 142170)
--- trunk/Source/WebCore/platform/blackberry/ClipboardBlackBerry.h 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/blackberry/ClipboardBlackBerry.h 2013-02-07 21:26:41 UTC (rev 142170)
@@ -39,7 +39,7 @@
bool setData(const String& type, const String& data);
// extensions beyond IE's API
- virtual Vector<String> types() const;
+ virtual ListHashSet<String> types() const;
virtual PassRefPtr<FileList> files() const;
virtual DragImageRef createDragImage(IntPoint&) const;
virtual void declareAndWriteDragImage(Element*, const KURL&, const String& title, Frame*);
Modified: trunk/Source/WebCore/platform/chromium/ChromiumDataObject.cpp (142169 => 142170)
--- trunk/Source/WebCore/platform/chromium/ChromiumDataObject.cpp 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/chromium/ChromiumDataObject.cpp 2013-02-07 21:26:41 UTC (rev 142170)
@@ -126,20 +126,20 @@
}
}
-Vector<String> ChromiumDataObject::types() const
+ListHashSet<String> ChromiumDataObject::types() const
{
- Vector<String> results;
+ ListHashSet<String> results;
bool containsFiles = false;
for (size_t i = 0; i < m_itemList.size(); ++i) {
if (m_itemList[i]->kind() == DataTransferItem::kindString)
- results.append(m_itemList[i]->type());
+ results.add(m_itemList[i]->type());
else if (m_itemList[i]->kind() == DataTransferItem::kindFile)
containsFiles = true;
else
ASSERT_NOT_REACHED();
}
if (containsFiles)
- results.append(ASCIILiteral(mimeTypeFiles));
+ results.add(mimeTypeFiles);
return results;
}
Modified: trunk/Source/WebCore/platform/chromium/ChromiumDataObject.h (142169 => 142170)
--- trunk/Source/WebCore/platform/chromium/ChromiumDataObject.h 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/chromium/ChromiumDataObject.h 2013-02-07 21:26:41 UTC (rev 142170)
@@ -69,7 +69,7 @@
void clearData(const String& type);
void clearAllExceptFiles();
- Vector<String> types() const;
+ ListHashSet<String> types() const;
String getData(const String& type) const;
bool setData(const String& type, const String& data);
Modified: trunk/Source/WebCore/platform/chromium/ClipboardChromium.cpp (142169 => 142170)
--- trunk/Source/WebCore/platform/chromium/ClipboardChromium.cpp 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/chromium/ClipboardChromium.cpp 2013-02-07 21:26:41 UTC (rev 142170)
@@ -275,10 +275,10 @@
}
// extensions beyond IE's API
-Vector<String> ClipboardChromium::types() const
+ListHashSet<String> ClipboardChromium::types() const
{
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
- return Vector<String>();
+ return ListHashSet<String>();
return m_dataObject->types();
}
Modified: trunk/Source/WebCore/platform/chromium/ClipboardChromium.h (142169 => 142170)
--- trunk/Source/WebCore/platform/chromium/ClipboardChromium.h 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/chromium/ClipboardChromium.h 2013-02-07 21:26:41 UTC (rev 142170)
@@ -84,7 +84,7 @@
bool platformClipboardChanged() const;
// extensions beyond IE's API
- virtual Vector<String> types() const;
+ virtual ListHashSet<String> types() const;
virtual PassRefPtr<FileList> files() const;
void setDragImage(CachedImage*, const IntPoint&);
Modified: trunk/Source/WebCore/platform/efl/ClipboardEfl.cpp (142169 => 142170)
--- trunk/Source/WebCore/platform/efl/ClipboardEfl.cpp 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/efl/ClipboardEfl.cpp 2013-02-07 21:26:41 UTC (rev 142170)
@@ -76,10 +76,10 @@
return false;
}
-Vector<String> ClipboardEfl::types() const
+ListHashSet<String> ClipboardEfl::types() const
{
notImplemented();
- return Vector<String>();
+ return ListHashSet<String>();
}
PassRefPtr<FileList> ClipboardEfl::files() const
Modified: trunk/Source/WebCore/platform/efl/ClipboardEfl.h (142169 => 142170)
--- trunk/Source/WebCore/platform/efl/ClipboardEfl.h 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/efl/ClipboardEfl.h 2013-02-07 21:26:41 UTC (rev 142170)
@@ -39,7 +39,7 @@
String getData(const String&) const;
bool setData(const String&, const String&);
- Vector<String> types() const;
+ ListHashSet<String> types() const;
virtual PassRefPtr<FileList> files() const;
IntPoint dragLocation() const;
Modified: trunk/Source/WebCore/platform/gtk/ClipboardGtk.cpp (142169 => 142170)
--- trunk/Source/WebCore/platform/gtk/ClipboardGtk.cpp 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/gtk/ClipboardGtk.cpp 2013-02-07 21:26:41 UTC (rev 142170)
@@ -188,31 +188,31 @@
return success;
}
-Vector<String> ClipboardGtk::types() const
+ListHashSet<String> ClipboardGtk::types() const
{
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
- return Vector<String>();
+ return ListHashSet<String>();
if (m_clipboard)
PasteboardHelper::defaultPasteboardHelper()->getClipboardContents(m_clipboard);
- Vector<String> types;
+ ListHashSet<String> types;
if (m_dataObject->hasText()) {
- types.append(ASCIILiteral("text/plain"));
- types.append(ASCIILiteral("Text"));
- types.append(ASCIILiteral("text"));
+ types.add("text/plain");
+ types.add("Text");
+ types.add("text");
}
if (m_dataObject->hasMarkup())
- types.append(ASCIILiteral("text/html"));
+ types.add("text/html");
if (m_dataObject->hasURIList()) {
- types.append(ASCIILiteral("text/uri-list"));
- types.append(ASCIILiteral("URL"));
+ types.add("text/uri-list");
+ types.add("URL");
}
if (m_dataObject->hasFilenames())
- types.append(ASCIILiteral("Files"));
+ types.add("Files");
return types;
}
Modified: trunk/Source/WebCore/platform/gtk/ClipboardGtk.h (142169 => 142170)
--- trunk/Source/WebCore/platform/gtk/ClipboardGtk.h 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/gtk/ClipboardGtk.h 2013-02-07 21:26:41 UTC (rev 142170)
@@ -57,7 +57,7 @@
String getData(const String&) const;
bool setData(const String&, const String&);
- virtual Vector<String> types() const;
+ virtual ListHashSet<String> types() const;
virtual PassRefPtr<FileList> files() const;
void setDragImage(CachedImage*, const IntPoint&);
Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.h (142169 => 142170)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.h 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.h 2013-02-07 21:26:41 UTC (rev 142170)
@@ -62,7 +62,7 @@
virtual bool hasData();
// extensions beyond IE's API
- virtual Vector<String> types() const;
+ virtual ListHashSet<String> types() const;
virtual PassRefPtr<FileList> files() const;
void setDragImage(CachedImage*, const IntPoint&);
Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.mm (142169 => 142170)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-02-07 21:26:41 UTC (rev 142170)
@@ -118,15 +118,15 @@
return String();
}
-static void addHTMLClipboardTypesForCocoaType(Vector<String>& resultTypes, const String& cocoaType, const String& pasteboardName)
+static void addHTMLClipboardTypesForCocoaType(ListHashSet<String>& resultTypes, const String& cocoaType, const String& pasteboardName)
{
// UTI may not do these right, so make sure we get the right, predictable result
if (cocoaType == String(NSStringPboardType)) {
- resultTypes.append(ASCIILiteral("text/plain"));
+ resultTypes.add("text/plain");
return;
}
if (cocoaType == String(NSURLPboardType)) {
- resultTypes.append(ASCIILiteral("text/uri-list"));
+ resultTypes.add("text/uri-list");
return;
}
if (cocoaType == String(NSFilenamesPboardType)) {
@@ -138,18 +138,18 @@
if (!fileList.isEmpty()) {
// It is unknown if NSFilenamesPboardType always implies NSURLPboardType in Cocoa,
// but NSFilenamesPboardType should imply both 'text/uri-list' and 'Files'
- resultTypes.append(ASCIILiteral("text/uri-list"));
- resultTypes.append(ASCIILiteral("Files"));
+ resultTypes.add("text/uri-list");
+ resultTypes.add("Files");
}
return;
}
String utiType = utiTypeFromCocoaType(cocoaType);
if (!utiType.isEmpty()) {
- resultTypes.append(utiType);
+ resultTypes.add(utiType);
return;
}
// No mapping, just pass the whole string though
- resultTypes.append(cocoaType);
+ resultTypes.add(cocoaType);
}
void ClipboardMac::clearData(const String& type)
@@ -280,10 +280,10 @@
return false;
}
-Vector<String> ClipboardMac::types() const
+ListHashSet<String> ClipboardMac::types() const
{
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
- return Vector<String>();
+ return ListHashSet<String>();
Vector<String> types;
platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
@@ -291,9 +291,9 @@
// Enforce changeCount ourselves for security. We check after reading instead of before to be
// sure it doesn't change between our testing the change count and accessing the data.
if (m_changeCount != platformStrategies()->pasteboardStrategy()->changeCount(m_pasteboardName))
- return Vector<String>();
+ return ListHashSet<String>();
- Vector<String> result;
+ ListHashSet<String> result;
// FIXME: This loop could be split into two stages. One which adds all the HTML5 specified types
// and a second which adds all the extra types from the cocoa clipboard (which is Mac-only behavior).
for (size_t i = 0; i < types.size(); i++) {
Modified: trunk/Source/WebCore/platform/qt/ClipboardQt.cpp (142169 => 142170)
--- trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2013-02-07 21:26:41 UTC (rev 142170)
@@ -182,16 +182,16 @@
}
// extensions beyond IE's API
-Vector<String> ClipboardQt::types() const
+ListHashSet<String> ClipboardQt::types() const
{
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
- return Vector<String>();
+ return ListHashSet<String>();
ASSERT(m_readableData);
- Vector<String> result;
+ ListHashSet<String> result;
QStringList formats = m_readableData->formats();
for (int i = 0; i < formats.count(); ++i)
- result.append(formats.at(i));
+ result.add(formats.at(i));
return result;
}
Modified: trunk/Source/WebCore/platform/qt/ClipboardQt.h (142169 => 142170)
--- trunk/Source/WebCore/platform/qt/ClipboardQt.h 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/qt/ClipboardQt.h 2013-02-07 21:26:41 UTC (rev 142170)
@@ -57,7 +57,7 @@
bool setData(const String& type, const String& data);
// extensions beyond IE's API
- virtual Vector<String> types() const;
+ virtual ListHashSet<String> types() const;
virtual PassRefPtr<FileList> files() const;
void setDragImage(CachedImage*, const IntPoint&);
Modified: trunk/Source/WebCore/platform/win/ClipboardWin.cpp (142169 => 142170)
--- trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-02-07 21:26:41 UTC (rev 142170)
@@ -484,24 +484,24 @@
return false;
}
-static void addMimeTypesForFormat(Vector<String>& results, const FORMATETC& format)
+static void addMimeTypesForFormat(ListHashSet<String>& results, const FORMATETC& format)
{
// URL and Text are provided for compatibility with IE's model
if (format.cfFormat == urlFormat()->cfFormat || format.cfFormat == urlWFormat()->cfFormat) {
- results.append(ASCIILiteral("URL"));
- results.append(ASCIILiteral("text/uri-list"));
+ results.add("URL");
+ results.add("text/uri-list");
}
if (format.cfFormat == plainTextWFormat()->cfFormat || format.cfFormat == plainTextFormat()->cfFormat) {
- results.append(ASCIILiteral("Text"));
- results.append(ASCIILiteral("text/plain"));
+ results.add("Text");
+ results.add("text/plain");
}
}
// extensions beyond IE's API
-Vector<String> ClipboardWin::types() const
+ListHashSet<String> ClipboardWin::types() const
{
- Vector<String> results;
+ ListHashSet<String> results;
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
return results;
Modified: trunk/Source/WebCore/platform/win/ClipboardWin.h (142169 => 142170)
--- trunk/Source/WebCore/platform/win/ClipboardWin.h 2013-02-07 21:20:14 UTC (rev 142169)
+++ trunk/Source/WebCore/platform/win/ClipboardWin.h 2013-02-07 21:26:41 UTC (rev 142170)
@@ -64,7 +64,7 @@
bool setData(const String& type, const String& data);
// extensions beyond IE's API
- virtual Vector<String> types() const;
+ virtual ListHashSet<String> types() const;
virtual PassRefPtr<FileList> files() const;
void setDragImage(CachedImage*, const IntPoint&);
