Changeset 69202 in webkit
- Timestamp:
- Oct 6, 2010 9:45:56 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r69163 r69202 1 2010-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 1 14 2010-09-29 Alpha Lam <hclam@chromium.org> 2 15 -
trunk/WebKit/chromium/DEPS
r68929 r69202 33 33 vars = { 34 34 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', 35 'chromium_rev': '61 206',35 'chromium_rev': '61472', 36 36 } 37 37 -
trunk/WebKit/chromium/public/WebDragData.h
r68915 r69202 79 79 WEBKIT_API void setFileExtension(const WebString&); 80 80 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 87 81 WEBKIT_API bool containsFilenames() const; 88 82 WEBKIT_API void filenames(WebVector<WebString>&) const; … … 98 92 WEBKIT_API WebURL htmlBaseURL() const; 99 93 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&);104 94 105 95 WEBKIT_API WebString fileContentFilename() const; -
trunk/WebKit/chromium/src/WebDragData.cpp
r68915 r69202 116 116 } 117 117 118 bool WebDragData::hasFileNames() const119 {120 return containsFilenames();121 }122 123 void WebDragData::fileNames(WebVector<WebString>& fileNames) const124 {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 138 118 bool WebDragData::containsFilenames() const 139 119 { … … 200 180 ensureMutable(); 201 181 m_private->setHtmlBaseUrl(htmlBaseURL); 202 }203 204 WebString WebDragData::fileContentFileName() const205 {206 return fileContentFilename();207 }208 209 void WebDragData::setFileContentFileName(const WebString& fileName)210 {211 return setFileContentFilename(fileName);212 182 } 213 183 -
trunk/WebKitTools/ChangeLog
r69200 r69202 1 2010-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 1 15 2010-10-06 David Kilzer <ddkilzer@apple.com> 2 16 -
trunk/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
r67585 r69202 780 780 Vector<string> files = arguments[0].toStringVector(); 781 781 for (size_t i = 0; i < files.size(); ++i) 782 currentDragData.appendToFile Names(webkit_support::GetAbsoluteWebStringFromUTF8Path(files[i]));782 currentDragData.appendToFilenames(webkit_support::GetAbsoluteWebStringFromUTF8Path(files[i])); 783 783 currentDragEffectsAllowed = WebKit::WebDragOperationCopy; 784 784 -
trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
r68801 r69202 125 125 static void addDRTFakeFileToDataObject(WebDragData* dragData) 126 126 { 127 dragData->appendToFile Names(WebString::fromUTF8("DRTFakeFile"));127 dragData->appendToFilenames(WebString::fromUTF8("DRTFakeFile")); 128 128 } 129 129
Note: See TracChangeset
for help on using the changeset viewer.