Changeset 63914 in webkit

Timestamp:

Jul 22, 2010 2:26:55 PM (14 years ago)

Author:

johnnyg@google.com

Message:

2010-07-22 John Gregg <​johnnyg@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLInputElement.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-22  John Gregg  <johnnyg@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@chromium.org>
 

trunk/WebCore/html/HTMLInputElement.cpp

@@ -1997 +1997 @@
         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++)