Changeset 142170 in webkit


Ignore:
Timestamp:
Feb 7, 2013 1:26:41 PM (11 years ago)
Author:
gavinp@chromium.org
Message:

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):

Location:
trunk/Source/WebCore
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r142168 r142170  
     12013-02-07  Gavin Peters  <gavinp@chromium.org>
     2
     3        Unreviewed, rolling out r142155.
     4        http://trac.webkit.org/changeset/142155
     5        https://bugs.webkit.org/show_bug.cgi?id=82888
     6
     7        cr/win build broke.
     8
     9        * bindings/js/JSClipboardCustom.cpp:
     10        (WebCore::JSClipboard::types):
     11        * bindings/v8/custom/V8ClipboardCustom.cpp:
     12        (WebCore::V8Clipboard::typesAccessorGetter):
     13        * dom/Clipboard.h:
     14        (Clipboard):
     15        * platform/blackberry/ClipboardBlackBerry.cpp:
     16        (WebCore::ClipboardBlackBerry::types):
     17        * platform/blackberry/ClipboardBlackBerry.h:
     18        (ClipboardBlackBerry):
     19        * platform/chromium/ChromiumDataObject.cpp:
     20        (WebCore::ChromiumDataObject::types):
     21        * platform/chromium/ChromiumDataObject.h:
     22        (ChromiumDataObject):
     23        * platform/chromium/ClipboardChromium.cpp:
     24        (WebCore::ClipboardChromium::types):
     25        * platform/chromium/ClipboardChromium.h:
     26        (ClipboardChromium):
     27        * platform/efl/ClipboardEfl.cpp:
     28        (WebCore::ClipboardEfl::types):
     29        * platform/efl/ClipboardEfl.h:
     30        (ClipboardEfl):
     31        * platform/gtk/ClipboardGtk.cpp:
     32        (WebCore::ClipboardGtk::types):
     33        * platform/gtk/ClipboardGtk.h:
     34        (ClipboardGtk):
     35        * platform/mac/ClipboardMac.h:
     36        (ClipboardMac):
     37        * platform/mac/ClipboardMac.mm:
     38        (WebCore::addHTMLClipboardTypesForCocoaType):
     39        (WebCore::ClipboardMac::types):
     40        * platform/qt/ClipboardQt.cpp:
     41        (WebCore::ClipboardQt::types):
     42        * platform/qt/ClipboardQt.h:
     43        (ClipboardQt):
     44        * platform/win/ClipboardWin.cpp:
     45        (WebCore::addMimeTypesForFormat):
     46        (WebCore::ClipboardWin::types):
     47        * platform/win/ClipboardWin.h:
     48        (ClipboardWin):
     49
    1502013-02-07  Rik Cabanier  <cabanier@adobe.com>
    251

  • trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp

    r142155 r142170  
    5252    Clipboard* clipboard = impl();
    5353
    54     Vector<String> types = clipboard->types();
     54    ListHashSet<String> types = clipboard->types();
    5555    if (types.isEmpty())
    5656        return jsNull();
    5757
    5858    MarkedArgumentBuffer list;
    59     Vector<String>::const_iterator end = types.end();
    60     for (Vector<String>::const_iterator it = types.begin(); it != end; ++it)
     59    ListHashSet<String>::const_iterator end = types.end();
     60    for (ListHashSet<String>::const_iterator it = types.begin(); it != end; ++it)
    6161        list.append(jsStringWithCache(exec, *it));
    6262    return constructArray(exec, 0, globalObject(), list);

  • trunk/Source/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp

    r142155 r142170  
    4848    Clipboard* clipboard = V8Clipboard::toNative(info.Holder());
    4949
    50     Vector<String> types = clipboard->types();
     50    ListHashSet<String> types = clipboard->types();
    5151    if (types.isEmpty())
    5252        return v8Null(info.GetIsolate());
    5353
    5454    v8::Local<v8::Array> result = v8::Array::New(types.size());
    55     Vector<String>::const_iterator end = types.end();
     55    ListHashSet<String>::const_iterator end = types.end();
    5656    int index = 0;
    57     for (Vector<String>::const_iterator it = types.begin(); it != end; ++it, ++index)
     57    for (ListHashSet<String>::const_iterator it = types.begin(); it != end; ++it, ++index)
    5858        result->Set(v8Integer(index, info.GetIsolate()), v8String(*it, info.GetIsolate()));
    5959

  • trunk/Source/WebCore/dom/Clipboard.h

    r142155 r142170  
    6767   
    6868        // extensions beyond IE's API
    69         virtual Vector<String> types() const = 0;
     69        virtual ListHashSet<String> types() const = 0;
    7070        virtual PassRefPtr<FileList> files() const = 0;
    7171

  • trunk/Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp

    r142155 r142170  
    7979}
    8080
    81 Vector<String> ClipboardBlackBerry::types() const
     81ListHashSet<String> ClipboardBlackBerry::types() const
    8282{
    8383    if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
    84         return Vector<String>();
     84        return ListHashSet<String>();
    8585
    8686    // We use hardcoded list here since there seems to be no API to get the list.
    87     Vector<String> ret;
    88     ret.append(ASCIILiteral("text/plain"));
    89     ret.append(ASCIILiteral("text/html"));
    90     ret.append(ASCIILiteral("text/url"));
     87    ListHashSet<String> ret;
     88    ret.add("text/plain");
     89    ret.add("text/html");
     90    ret.add("text/url");
    9191    return ret;
    9292}

  • trunk/Source/WebCore/platform/blackberry/ClipboardBlackBerry.h

    r142155 r142170  
    4040
    4141    // extensions beyond IE's API
    42     virtual Vector<String> types() const;
     42    virtual ListHashSet<String> types() const;
    4343    virtual PassRefPtr<FileList> files() const;
    4444    virtual DragImageRef createDragImage(IntPoint&) const;

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

    r142155 r142170  
    127127}
    128128
    129 Vector<String> ChromiumDataObject::types() const
    130 {
    131     Vector<String> results;
     129ListHashSet<String> ChromiumDataObject::types() const
     130{
     131    ListHashSet<String> results;
    132132    bool containsFiles = false;
    133133    for (size_t i = 0; i < m_itemList.size(); ++i) {
    134134        if (m_itemList[i]->kind() == DataTransferItem::kindString)
    135             results.append(m_itemList[i]->type());
     135            results.add(m_itemList[i]->type());
    136136        else if (m_itemList[i]->kind() == DataTransferItem::kindFile)
    137137            containsFiles = true;
    … …  
    140140    }
    141141    if (containsFiles)
    142         results.append(ASCIILiteral(mimeTypeFiles));
     142        results.add(mimeTypeFiles);
    143143    return results;
    144144}

  • trunk/Source/WebCore/platform/chromium/ChromiumDataObject.h

    r142155 r142170  
    7070    void clearAllExceptFiles();
    7171
    72     Vector<String> types() const;
     72    ListHashSet<String> types() const;
    7373    String getData(const String& type) const;
    7474    bool setData(const String& type, const String& data);

  • trunk/Source/WebCore/platform/chromium/ClipboardChromium.cpp

    r142155 r142170  
    276276
    277277// extensions beyond IE's API
    278 Vector<String> ClipboardChromium::types() const
     278ListHashSet<String> ClipboardChromium::types() const
    279279{
    280280    if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
    281         return Vector<String>();
     281        return ListHashSet<String>();
    282282
    283283    return m_dataObject->types();

  • trunk/Source/WebCore/platform/chromium/ClipboardChromium.h

    r142155 r142170  
    8585
    8686        // extensions beyond IE's API
    87         virtual Vector<String> types() const;
     87        virtual ListHashSet<String> types() const;
    8888        virtual PassRefPtr<FileList> files() const;
    8989

  • trunk/Source/WebCore/platform/efl/ClipboardEfl.cpp

    r142155 r142170  
    7777}
    7878
    79 Vector<String> ClipboardEfl::types() const
     79ListHashSet<String> ClipboardEfl::types() const
    8080{
    8181    notImplemented();
    82     return Vector<String>();
     82    return ListHashSet<String>();
    8383}
    8484

  • trunk/Source/WebCore/platform/efl/ClipboardEfl.h

    r142155 r142170  
    4040    bool setData(const String&, const String&);
    4141
    42     Vector<String> types() const;
     42    ListHashSet<String> types() const;
    4343    virtual PassRefPtr<FileList> files() const;
    4444

  • trunk/Source/WebCore/platform/gtk/ClipboardGtk.cpp

    r142155 r142170  
    189189}
    190190
    191 Vector<String> ClipboardGtk::types() const
     191ListHashSet<String> ClipboardGtk::types() const
    192192{
    193193    if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
    194         return Vector<String>();
     194        return ListHashSet<String>();
    195195
    196196    if (m_clipboard)
    197197        PasteboardHelper::defaultPasteboardHelper()->getClipboardContents(m_clipboard);
    198198
    199     Vector<String> types;
     199    ListHashSet<String> types;
    200200    if (m_dataObject->hasText()) {
    201         types.append(ASCIILiteral("text/plain"));
    202         types.append(ASCIILiteral("Text"));
    203         types.append(ASCIILiteral("text"));
     201        types.add("text/plain");
     202        types.add("Text");
     203        types.add("text");
    204204    }
    205205
    206206    if (m_dataObject->hasMarkup())
    207         types.append(ASCIILiteral("text/html"));
     207        types.add("text/html");
    208208
    209209    if (m_dataObject->hasURIList()) {
    210         types.append(ASCIILiteral("text/uri-list"));
    211         types.append(ASCIILiteral("URL"));
     210        types.add("text/uri-list");
     211        types.add("URL");
    212212    }
    213213
    214214    if (m_dataObject->hasFilenames())
    215         types.append(ASCIILiteral("Files"));
     215        types.add("Files");
    216216
    217217    return types;

  • trunk/Source/WebCore/platform/gtk/ClipboardGtk.h

    r142155 r142170  
    5858        bool setData(const String&, const String&);
    5959
    60         virtual Vector<String> types() const;
     60        virtual ListHashSet<String> types() const;
    6161        virtual PassRefPtr<FileList> files() const;
    6262

  • trunk/Source/WebCore/platform/mac/ClipboardMac.h

    r142155 r142170  
    6363   
    6464    // extensions beyond IE's API
    65     virtual Vector<String> types() const;
     65    virtual ListHashSet<String> types() const;
    6666    virtual PassRefPtr<FileList> files() const;
    6767

  • trunk/Source/WebCore/platform/mac/ClipboardMac.mm

    r142155 r142170  
    119119}
    120120
    121 static void addHTMLClipboardTypesForCocoaType(Vector<String>& resultTypes, const String& cocoaType, const String& pasteboardName)
     121static void addHTMLClipboardTypesForCocoaType(ListHashSet<String>& resultTypes, const String& cocoaType, const String& pasteboardName)
    122122{
    123123    // UTI may not do these right, so make sure we get the right, predictable result
    124124    if (cocoaType == String(NSStringPboardType)) {
    125         resultTypes.append(ASCIILiteral("text/plain"));
     125        resultTypes.add("text/plain");
    126126        return;
    127127    }
    128128    if (cocoaType == String(NSURLPboardType)) {
    129         resultTypes.append(ASCIILiteral("text/uri-list"));
     129        resultTypes.add("text/uri-list");
    130130        return;
    131131    }
    … …  
    139139            // It is unknown if NSFilenamesPboardType always implies NSURLPboardType in Cocoa,
    140140            // but NSFilenamesPboardType should imply both 'text/uri-list' and 'Files'
    141             resultTypes.append(ASCIILiteral("text/uri-list"));
    142             resultTypes.append(ASCIILiteral("Files"));
     141            resultTypes.add("text/uri-list");
     142            resultTypes.add("Files");
    143143        }
    144144        return;
    … …  
    146146    String utiType = utiTypeFromCocoaType(cocoaType);
    147147    if (!utiType.isEmpty()) {
    148         resultTypes.append(utiType);
     148        resultTypes.add(utiType);
    149149        return;
    150150    }
    151151    // No mapping, just pass the whole string though
    152     resultTypes.append(cocoaType);
     152    resultTypes.add(cocoaType);
    153153}
    154154
    … …  
    281281}
    282282
    283 Vector<String> ClipboardMac::types() const
     283ListHashSet<String> ClipboardMac::types() const
    284284{
    285285    if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
    286         return Vector<String>();
     286        return ListHashSet<String>();
    287287
    288288    Vector<String> types;
    … …  
    292292    // sure it doesn't change between our testing the change count and accessing the data.
    293293    if (m_changeCount != platformStrategies()->pasteboardStrategy()->changeCount(m_pasteboardName))
    294         return Vector<String>();
    295 
    296     Vector<String> result;
     294        return ListHashSet<String>();
     295
     296    ListHashSet<String> result;
    297297    // FIXME: This loop could be split into two stages. One which adds all the HTML5 specified types
    298298    // and a second which adds all the extra types from the cocoa clipboard (which is Mac-only behavior).

  • trunk/Source/WebCore/platform/qt/ClipboardQt.cpp

    r142155 r142170  
    183183
    184184// extensions beyond IE's API
    185 Vector<String> ClipboardQt::types() const
     185ListHashSet<String> ClipboardQt::types() const
    186186{
    187187    if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
    188         return Vector<String>();
     188        return ListHashSet<String>();
    189189
    190190    ASSERT(m_readableData);
    191     Vector<String> result;
     191    ListHashSet<String> result;
    192192    QStringList formats = m_readableData->formats();
    193193    for (int i = 0; i < formats.count(); ++i)
    194         result.append(formats.at(i));
     194        result.add(formats.at(i));
    195195    return result;
    196196}

  • trunk/Source/WebCore/platform/qt/ClipboardQt.h

    r142155 r142170  
    5858
    5959    // extensions beyond IE's API
    60     virtual Vector<String> types() const;
     60    virtual ListHashSet<String> types() const;
    6161    virtual PassRefPtr<FileList> files() const;
    6262

  • trunk/Source/WebCore/platform/win/ClipboardWin.cpp

    r142155 r142170  
    485485}
    486486
    487 static void addMimeTypesForFormat(Vector<String>& results, const FORMATETC& format)
     487static void addMimeTypesForFormat(ListHashSet<String>& results, const FORMATETC& format)
    488488{
    489489    // URL and Text are provided for compatibility with IE's model
    490490    if (format.cfFormat == urlFormat()->cfFormat || format.cfFormat == urlWFormat()->cfFormat) {
    491         results.append(ASCIILiteral("URL"));
    492         results.append(ASCIILiteral("text/uri-list"));
     491        results.add("URL");
     492        results.add("text/uri-list");
    493493    }
    494494
    495495    if (format.cfFormat == plainTextWFormat()->cfFormat || format.cfFormat == plainTextFormat()->cfFormat) {
    496         results.append(ASCIILiteral("Text"));
    497         results.append(ASCIILiteral("text/plain"));
     496        results.add("Text");
     497        results.add("text/plain");
    498498    }
    499499}
    500500
    501501// extensions beyond IE's API
    502 Vector<String> ClipboardWin::types() const
     502ListHashSet<String> ClipboardWin::types() const
    503503{
    504     Vector<String> results;
     504    ListHashSet<String> results;
    505505    if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
    506506        return results;

  • trunk/Source/WebCore/platform/win/ClipboardWin.h

    r142155 r142170  
    6565
    6666    // extensions beyond IE's API
    67     virtual Vector<String> types() const;
     67    virtual ListHashSet<String> types() const;
    6868    virtual PassRefPtr<FileList> files() const;
    6969
Note: See TracChangeset for help on using the changeset viewer.