Changeset 69202 in webkit


Ignore:
Timestamp:
Oct 6, 2010 9:45:56 AM (13 years ago)
Author:
tony@chromium.org
Message:

2010-10-06 Daniel Cheng <dcheng@chromium.org>

Reviewed by Tony Chang.

[chromium] Minor naming cleanup in WebDragData, part 2
https://bugs.webkit.org/show_bug.cgi?id=46937

Chromium no longer uses the deprecated methods, so delete them.

  • DEPS:
  • public/WebDragData.h:
  • src/WebDragData.cpp:

2010-10-06 Daniel Cheng <dcheng@chromium.org>

Reviewed by Tony Chang.

[chromium] Minor naming cleanup in WebDragData, part 2
https://bugs.webkit.org/show_bug.cgi?id=46937

Update DRT to use the renamed methods.

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

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/chromium/ChangeLog

    r69163 r69202  
     12010-10-06  Daniel Cheng  <dcheng@chromium.org>
     2
     3        Reviewed by Tony Chang.
     4
     5        [chromium] Minor naming cleanup in WebDragData, part 2
     6        https://bugs.webkit.org/show_bug.cgi?id=46937
     7
     8        Chromium no longer uses the deprecated methods, so delete them.
     9
     10        * DEPS:
     11        * public/WebDragData.h:
     12        * src/WebDragData.cpp:
     13
    1142010-09-29  Alpha Lam  <hclam@chromium.org>
    215
  • trunk/WebKit/chromium/DEPS

    r68929 r69202  
    3333vars = {
    3434  'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
    35   'chromium_rev': '61206',
     35  'chromium_rev': '61472',
    3636}
    3737
  • trunk/WebKit/chromium/public/WebDragData.h

    r68915 r69202  
    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 
    8781    WEBKIT_API bool containsFilenames() const;
    8882    WEBKIT_API void filenames(WebVector<WebString>&) const;
     
    9892    WEBKIT_API WebURL htmlBaseURL() const;
    9993    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&);
    10494
    10595    WEBKIT_API WebString fileContentFilename() const;
  • trunk/WebKit/chromium/src/WebDragData.cpp

    r68915 r69202  
    116116}
    117117
    118 bool WebDragData::hasFileNames() const
    119 {
    120     return containsFilenames();
    121 }
    122 
    123 void WebDragData::fileNames(WebVector<WebString>& fileNames) const
    124 {
    125     filenames(fileNames);
    126 }
    127 
    128 void WebDragData::setFileNames(const WebVector<WebString>& fileNames)
    129 {
    130     return setFilenames(fileNames);
    131 }
    132 
    133 void WebDragData::appendToFileNames(const WebString& fileName)
    134 {
    135     return appendToFilenames(fileName);
    136 }
    137 
    138118bool WebDragData::containsFilenames() const
    139119{
     
    200180    ensureMutable();
    201181    m_private->setHtmlBaseUrl(htmlBaseURL);
    202 }
    203 
    204 WebString WebDragData::fileContentFileName() const
    205 {
    206     return fileContentFilename();
    207 }
    208 
    209 void WebDragData::setFileContentFileName(const WebString& fileName)
    210 {
    211     return setFileContentFilename(fileName);
    212182}
    213183
  • trunk/WebKitTools/ChangeLog

    r69200 r69202  
     12010-10-06  Daniel Cheng  <dcheng@chromium.org>
     2
     3        Reviewed by Tony Chang.
     4
     5        [chromium] Minor naming cleanup in WebDragData, part 2
     6        https://bugs.webkit.org/show_bug.cgi?id=46937
     7
     8        Update DRT to use the renamed methods.
     9
     10        * DumpRenderTree/chromium/EventSender.cpp:
     11        (EventSender::beginDragWithFiles):
     12        * DumpRenderTree/chromium/WebViewHost.cpp:
     13        (addDRTFakeFileToDataObject):
     14
    1152010-10-06  David Kilzer  <ddkilzer@apple.com>
    216
  • trunk/WebKitTools/DumpRenderTree/chromium/EventSender.cpp

    r67585 r69202  
    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

    r68801 r69202  
    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.