[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:24:15 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4f6ab28a901e8b2ba45a2f2497dbbf764498aed6
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 7 22:04:23 2010 +0000
2010-10-07 Daniel Cheng <dcheng at chromium.org>
Reviewed by Tony Chang.
[chromium] Minor naming cleanup in WebDragData, part 2
https://bugs.webkit.org/show_bug.cgi?id=47227
Chromium no longer uses the deprecated methods, so delete them.
* DEPS:
* public/WebDragData.h:
* src/WebDragData.cpp:
2010-10-07 Daniel Cheng <dcheng at chromium.org>
Reviewed by Tony Chang.
[chromium] Minor naming cleanup in WebDragData, part 2
https://bugs.webkit.org/show_bug.cgi?id=47227
Update DRT to use the renamed methods.
* DumpRenderTree/chromium/EventSender.cpp:
(EventSender::beginDragWithFiles):
* DumpRenderTree/chromium/WebViewHost.cpp:
(addDRTFakeFileToDataObject):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69346 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ffa7c0b..2989044 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-07 Daniel Cheng <dcheng at chromium.org>
+
+ Reviewed by Tony Chang.
+
+ [chromium] Minor naming cleanup in WebDragData, part 2
+ https://bugs.webkit.org/show_bug.cgi?id=47227
+
+ Chromium no longer uses the deprecated methods, so delete them.
+
+ * DEPS:
+ * public/WebDragData.h:
+ * src/WebDragData.cpp:
+
2010-10-07 Dave Moore <davemoore at chromium.org>
Reviewed by Kent Tamura.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 8628916..6ab9cd3 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '61206',
+ 'chromium_rev': '61806',
}
deps = {
diff --git a/WebKit/chromium/public/WebDragData.h b/WebKit/chromium/public/WebDragData.h
index b1985c1..1d704f0 100644
--- a/WebKit/chromium/public/WebDragData.h
+++ b/WebKit/chromium/public/WebDragData.h
@@ -78,12 +78,6 @@ public:
WEBKIT_API WebString fileExtension() const;
WEBKIT_API void setFileExtension(const WebString&);
- // These methods are deprecated in favor of the ones in the next block.
- WEBKIT_API bool hasFileNames() const;
- WEBKIT_API void fileNames(WebVector<WebString>&) const;
- WEBKIT_API void setFileNames(const WebVector<WebString>&);
- WEBKIT_API void appendToFileNames(const WebString&);
-
WEBKIT_API bool containsFilenames() const;
WEBKIT_API void filenames(WebVector<WebString>&) const;
WEBKIT_API void setFilenames(const WebVector<WebString>&);
@@ -98,10 +92,6 @@ public:
WEBKIT_API WebURL htmlBaseURL() const;
WEBKIT_API void setHTMLBaseURL(const WebURL&);
- // These methods are deprecated in favor of the ones in the next block.
- WEBKIT_API WebString fileContentFileName() const;
- WEBKIT_API void setFileContentFileName(const WebString&);
-
WEBKIT_API WebString fileContentFilename() const;
WEBKIT_API void setFileContentFilename(const WebString&);
diff --git a/WebKit/chromium/src/WebDragData.cpp b/WebKit/chromium/src/WebDragData.cpp
index 1b19940..f264369 100644
--- a/WebKit/chromium/src/WebDragData.cpp
+++ b/WebKit/chromium/src/WebDragData.cpp
@@ -115,26 +115,6 @@ void WebDragData::setFileExtension(const WebString& fileExtension)
m_private->setFileExtension(fileExtension);
}
-bool WebDragData::hasFileNames() const
-{
- return containsFilenames();
-}
-
-void WebDragData::fileNames(WebVector<WebString>& fileNames) const
-{
- filenames(fileNames);
-}
-
-void WebDragData::setFileNames(const WebVector<WebString>& fileNames)
-{
- return setFilenames(fileNames);
-}
-
-void WebDragData::appendToFileNames(const WebString& fileName)
-{
- return appendToFilenames(fileName);
-}
-
bool WebDragData::containsFilenames() const
{
ASSERT(!isNull());
@@ -201,16 +181,6 @@ void WebDragData::setHTMLBaseURL(const WebURL& htmlBaseURL)
m_private->setHtmlBaseUrl(htmlBaseURL);
}
-WebString WebDragData::fileContentFileName() const
-{
- return fileContentFilename();
-}
-
-void WebDragData::setFileContentFileName(const WebString& fileName)
-{
- return setFileContentFilename(fileName);
-}
-
WebString WebDragData::fileContentFilename() const
{
ASSERT(!isNull());
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6d7e2c6..65dd528 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-07 Daniel Cheng <dcheng at chromium.org>
+
+ Reviewed by Tony Chang.
+
+ [chromium] Minor naming cleanup in WebDragData, part 2
+ https://bugs.webkit.org/show_bug.cgi?id=47227
+
+ Update DRT to use the renamed methods.
+
+ * DumpRenderTree/chromium/EventSender.cpp:
+ (EventSender::beginDragWithFiles):
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (addDRTFakeFileToDataObject):
+
2010-10-07 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
index 5f51553..074d4e7 100644
--- a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
@@ -779,7 +779,7 @@ void EventSender::beginDragWithFiles(const CppArgumentList& arguments, CppVarian
currentDragData.initialize();
Vector<string> files = arguments[0].toStringVector();
for (size_t i = 0; i < files.size(); ++i)
- currentDragData.appendToFileNames(webkit_support::GetAbsoluteWebStringFromUTF8Path(files[i]));
+ currentDragData.appendToFilenames(webkit_support::GetAbsoluteWebStringFromUTF8Path(files[i]));
currentDragEffectsAllowed = WebKit::WebDragOperationCopy;
// Provide a drag source.
diff --git a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
index 39cb9fe..cb14393 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -124,7 +124,7 @@ static string descriptionSuitableForTestResult(const string& url)
// dragging a file.
static void addDRTFakeFileToDataObject(WebDragData* dragData)
{
- dragData->appendToFileNames(WebString::fromUTF8("DRTFakeFile"));
+ dragData->appendToFilenames(WebString::fromUTF8("DRTFakeFile"));
}
// Get a debugging string from a WebNavigationType.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list