diff options
author | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 23:03:29 +0000 |
---|---|---|
committer | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 23:03:29 +0000 |
commit | 4520c1ef61642fc8130f1cd9de26db892c3da684 (patch) | |
tree | 11140eca636e129f8b21f56fd9504ff33f2ec458 /webkit/fileapi/file_system_util.cc | |
parent | 3e0c664682b788f3093e0528a772b51c72e95a1f (diff) | |
download | chromium_src-4520c1ef61642fc8130f1cd9de26db892c3da684.zip chromium_src-4520c1ef61642fc8130f1cd9de26db892c3da684.tar.gz chromium_src-4520c1ef61642fc8130f1cd9de26db892c3da684.tar.bz2 |
Revert 81319 - More filesystem cleanup: convert URL-encoded-as-FilePath to actual URL, where possible without WebKit API changes. The WebKit changes will happen in another CL. This is a resubmit of http://codereview.chromium.org/6767010/ [third try lucky,fourth try persistent?], which bounced most recently due to bugs manifestingonly on XP. There are a few changes here that weren't there [infile_system_operation_write_unittest.cc and file_system_operation.cc], butthey're pretty trivial build/test fixes.BUG=none TEST=noneReview URL: http://codereview.chromium.org/6821065
TBR=ericu@google.com
Review URL: http://codereview.chromium.org/6836002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_util.cc')
-rw-r--r-- | webkit/fileapi/file_system_util.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/fileapi/file_system_util.cc b/webkit/fileapi/file_system_util.cc index 4993e7f..a15c2a8 100644 --- a/webkit/fileapi/file_system_util.cc +++ b/webkit/fileapi/file_system_util.cc @@ -88,17 +88,17 @@ bool CrackFileSystemURL(const GURL& url, GURL* origin_url, FileSystemType* type, while (!path.empty() && path[0] == '/') path.erase(0, 1); +#if defined(OS_WIN) + const FilePath::StringType sys_path = base::SysUTF8ToWide(path); +#elif defined(OS_POSIX) + const FilePath::StringType sys_path = path; +#endif if (origin_url) *origin_url = origin; if (type) *type = file_system_type; if (file_path) -#if defined(OS_WIN) - *file_path = FilePath(base::SysUTF8ToWide(path)). - NormalizeWindowsPathSeparators(); -#elif defined(OS_POSIX) - *file_path = path; -#endif + *file_path = FilePath(sys_path); return true; } |