[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tony at chromium.org
tony at chromium.org
Wed Dec 22 14:18:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 38f1d095086d7a9ba30c1b1e16be58e3d50ba20d
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 6 17:10:05 2010 +0000
2010-10-06 Tony Chang <tony at 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 at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69207 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d3eb0e5..a9ec403 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-06 Tony Chang <tony at 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 Daniel Cheng <dcheng at chromium.org>
Reviewed by Tony Chang.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 354ea47..8628916 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': '61472',
+ 'chromium_rev': '61206',
}
deps = {
diff --git a/WebKit/chromium/public/WebDragData.h b/WebKit/chromium/public/WebDragData.h
index 1d704f0..b1985c1 100644
--- a/WebKit/chromium/public/WebDragData.h
+++ b/WebKit/chromium/public/WebDragData.h
@@ -78,6 +78,12 @@ 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>&);
@@ -92,6 +98,10 @@ 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 f264369..1b19940 100644
--- a/WebKit/chromium/src/WebDragData.cpp
+++ b/WebKit/chromium/src/WebDragData.cpp
@@ -115,6 +115,26 @@ 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());
@@ -181,6 +201,16 @@ 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 04c0f09..26c3261 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-06 Tony Chang <tony at 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):
+
2010-10-06 Daniel Cheng <dcheng at chromium.org>
Reviewed by Tony Chang.
diff --git a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
index 074d4e7..5f51553 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 977734a..e3ca85d 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