[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
johnnyg at google.com
johnnyg at google.com
Wed Dec 22 11:25:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 56cc48cab08070ef85a6b3ba7e04541794384819
Author: johnnyg at google.com <johnnyg at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 22 21:26:55 2010 +0000
2010-07-22 John Gregg <johnnyg at google.com>
Reviewed by Kent Tamura.
[chromium] fast/forms/input-file-directory-upload.html fails on win after r63454
https://bugs.webkit.org/show_bug.cgi?id=42768
Normalize path separators for the script API by convering \'s to /'s.
Covered by input-file-directory-upload.html
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::setFileListFromRenderer):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63914 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 081a618..763d569 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-22 John Gregg <johnnyg at google.com>
+
+ Reviewed by Kent Tamura.
+
+ [chromium] fast/forms/input-file-directory-upload.html fails on win after r63454
+ https://bugs.webkit.org/show_bug.cgi?id=42768
+
+ Normalize path separators for the script API by convering \'s to /'s.
+
+ Covered by input-file-directory-upload.html
+
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::setFileListFromRenderer):
+
2010-07-22 Dmitry Titov <dimich at chromium.org>
Rubberstamped by Simon Fraser.
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index 3df3544..00dc503 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -1996,8 +1996,11 @@ void HTMLInputElement::setFileListFromRenderer(const Vector<String>& paths)
}
rootPath = directoryName(rootPath);
ASSERT(rootPath.length());
- for (int i = 0; i < size; i++)
- m_fileList->append(File::create(paths[i].substring(1 + rootPath.length()), paths[i]));
+ for (int i = 0; i < size; i++) {
+ // Normalize backslashes to slashes before exposing the relative path to script.
+ String relativePath = paths[i].substring(1 + rootPath.length()).replace('\\','/');
+ m_fileList->append(File::create(relativePath, paths[i]));
+ }
} else {
for (int i = 0; i < size; i++)
m_fileList->append(File::create(paths[i]));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list