Changeset 69207 in webkit


Ignore:
Timestamp:
Oct 6, 2010 10:10:05 AM (14 years ago)
Author:
tony@chromium.org
Message:

2010-10-06 Tony Chang <​tony@chromium.org>

Unreviewed, rolling out r69202.
​http://trac.webkit.org/changeset/69202
​https://bugs.webkit.org/show_bug.cgi?id=46937

Broke compile of test_shell

  • DEPS:
  • public/WebDragData.h:
  • src/WebDragData.cpp: (WebKit::WebDragData::hasFileNames): (WebKit::WebDragData::fileNames): (WebKit::WebDragData::setFileNames): (WebKit::WebDragData::appendToFileNames): (WebKit::WebDragData::fileContentFileName): (WebKit::WebDragData::setFileContentFileName):

2010-10-06 Tony Chang <​tony@chromium.org>

Unreviewed, rolling out r69202.
​http://trac.webkit.org/changeset/69202
​https://bugs.webkit.org/show_bug.cgi?id=46937

Broke compile of test_shell

  • DumpRenderTree/chromium/EventSender.cpp: (EventSender::beginDragWithFiles):
  • DumpRenderTree/chromium/WebViewHost.cpp: (addDRTFakeFileToDataObject):
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r69202 r69207  
     12010-10-06  Tony Chang  <tony@chromium.org>
     2
     3        Unreviewed, rolling out r69202.
     4        http://trac.webkit.org/changeset/69202
     5        https://bugs.webkit.org/show_bug.cgi?id=46937
     6
     7        Broke compile of test_shell
     8
     9        * DEPS:
     10        * public/WebDragData.h:
     11        * src/WebDragData.cpp:
     12        (WebKit::WebDragData::hasFileNames):
     13        (WebKit::WebDragData::fileNames):
     14        (WebKit::WebDragData::setFileNames):
     15        (WebKit::WebDragData::appendToFileNames):
     16        (WebKit::WebDragData::fileContentFileName):
     17        (WebKit::WebDragData::setFileContentFileName):
     18
    1192010-10-06  Daniel Cheng  <dcheng@chromium.org>
    220

  • trunk/WebKit/chromium/DEPS

    r69202 r69207  
    3333vars = {
    3434  'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
    35   'chromium_rev': '61472',
     35  'chromium_rev': '61206',
    3636}
    3737

  • trunk/WebKit/chromium/public/WebDragData.h

    r69202 r69207  
    7979    WEBKIT_API void setFileExtension(const WebString&);
    8080
     81    // These methods are deprecated in favor of the ones in the next block.
     82    WEBKIT_API bool hasFileNames() const;
     83    WEBKIT_API void fileNames(WebVector<WebString>&) const;
     84    WEBKIT_API void setFileNames(const WebVector<WebString>&);
     85    WEBKIT_API void appendToFileNames(const WebString&);
     86
    8187    WEBKIT_API bool containsFilenames() const;
    8288    WEBKIT_API void filenames(WebVector<WebString>&) const;
    … …  
    9298    WEBKIT_API WebURL htmlBaseURL() const;
    9399    WEBKIT_API void setHTMLBaseURL(const WebURL&);
     100
     101    // These methods are deprecated in favor of the ones in the next block.
     102    WEBKIT_API WebString fileContentFileName() const;
     103    WEBKIT_API void setFileContentFileName(const WebString&);
    94104
    95105    WEBKIT_API WebString fileContentFilename() const;

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

    r69202 r69207  
    116116}
    117117
     118bool WebDragData::hasFileNames() const
     119{
     120    return containsFilenames();
     121}
     122
     123void WebDragData::fileNames(WebVector<WebString>& fileNames) const
     124{
     125    filenames(fileNames);
     126}
     127
     128void WebDragData::setFileNames(const WebVector<WebString>& fileNames)
     129{
     130    return setFilenames(fileNames);
     131}
     132
     133void WebDragData::appendToFileNames(const WebString& fileName)
     134{
     135    return appendToFilenames(fileName);
     136}
     137
    118138bool WebDragData::containsFilenames() const
    119139{
    … …  
    180200    ensureMutable();
    181201    m_private->setHtmlBaseUrl(htmlBaseURL);
     202}
     203
     204WebString WebDragData::fileContentFileName() const
     205{
     206    return fileContentFilename();
     207}
     208
     209void WebDragData::setFileContentFileName(const WebString& fileName)
     210{
     211    return setFileContentFilename(fileName);
    182212}
    183213

  • trunk/WebKitTools/ChangeLog

    r69202 r69207  
     12010-10-06  Tony Chang  <tony@chromium.org>
     2
     3        Unreviewed, rolling out r69202.
     4        http://trac.webkit.org/changeset/69202
     5        https://bugs.webkit.org/show_bug.cgi?id=46937
     6
     7        Broke compile of test_shell
     8
     9        * DumpRenderTree/chromium/EventSender.cpp:
     10        (EventSender::beginDragWithFiles):
     11        * DumpRenderTree/chromium/WebViewHost.cpp:
     12        (addDRTFakeFileToDataObject):
     13
    1142010-10-06  Daniel Cheng  <dcheng@chromium.org>
    215

  • trunk/WebKitTools/DumpRenderTree/chromium/EventSender.cpp

    r69202 r69207  
    780780    Vector<string> files = arguments[0].toStringVector();
    781781    for (size_t i = 0; i < files.size(); ++i)
    782         currentDragData.appendToFilenames(webkit_support::GetAbsoluteWebStringFromUTF8Path(files[i]));
     782        currentDragData.appendToFileNames(webkit_support::GetAbsoluteWebStringFromUTF8Path(files[i]));
    783783    currentDragEffectsAllowed = WebKit::WebDragOperationCopy;
    784784

  • trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp

    r69202 r69207  
    125125static void addDRTFakeFileToDataObject(WebDragData* dragData)
    126126{
    127     dragData->appendToFilenames(WebString::fromUTF8("DRTFakeFile"));
     127    dragData->appendToFileNames(WebString::fromUTF8("DRTFakeFile"));
    128128}
    129129
Note: See TracChangeset for help on using the changeset viewer.