summaryrefslogtreecommitdiffstats
path: root/content/common/file_system/webfilesystem_impl.cc
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 02:21:54 +0000
committertkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 02:21:54 +0000
commit6ac99518a9481ab6c13f0d7408f3fb8aab1242a6 (patch)
treee53574e0c71f3ea5d4e1c0632057aaff418014fe /content/common/file_system/webfilesystem_impl.cc
parentbc78d4db680894f3bf2eaa0d6ee713e9aec5eebb (diff)
downloadchromium_src-6ac99518a9481ab6c13f0d7408f3fb8aab1242a6.zip
chromium_src-6ac99518a9481ab6c13f0d7408f3fb8aab1242a6.tar.gz
chromium_src-6ac99518a9481ab6c13f0d7408f3fb8aab1242a6.tar.bz2
Revert 81028 - It broke LayoutTests/ fast/filesystem/op-copy.html on Windows Release and Debug.
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/, which bounced dueto a recent checkin that required a merge. There are a few changes here thatweren't there [in file_system_operation_write_unittest.cc andfile_system_operation.cc], but they're pretty trivial build/test fixes.BUG=none TEST=noneReview URL: http://codereview.chromium.org/6813066 TBR=ericu@google.com Review URL: http://codereview.chromium.org/6813072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/file_system/webfilesystem_impl.cc')
-rw-r--r--content/common/file_system/webfilesystem_impl.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/content/common/file_system/webfilesystem_impl.cc b/content/common/file_system/webfilesystem_impl.cc
index 38f1d2a..43b78f3 100644
--- a/content/common/file_system/webfilesystem_impl.cc
+++ b/content/common/file_system/webfilesystem_impl.cc
@@ -27,8 +27,8 @@ void WebFileSystemImpl::move(const WebString& src_path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->Move(GURL(src_path),
- GURL(dest_path),
+ dispatcher->Move(webkit_glue::WebStringToFilePath(src_path),
+ webkit_glue::WebStringToFilePath(dest_path),
new WebFileSystemCallbackDispatcher(callbacks));
}
@@ -37,8 +37,8 @@ void WebFileSystemImpl::copy(const WebString& src_path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->Copy(GURL(src_path),
- GURL(dest_path),
+ dispatcher->Copy(webkit_glue::WebStringToFilePath(src_path),
+ webkit_glue::WebStringToFilePath(dest_path),
new WebFileSystemCallbackDispatcher(callbacks));
}
@@ -46,7 +46,7 @@ void WebFileSystemImpl::remove(const WebString& path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->Remove(GURL(path),
+ dispatcher->Remove(webkit_glue::WebStringToFilePath(path),
false /* recursive */,
new WebFileSystemCallbackDispatcher(callbacks));
}
@@ -55,7 +55,7 @@ void WebFileSystemImpl::removeRecursively(const WebString& path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->Remove(GURL(path),
+ dispatcher->Remove(webkit_glue::WebStringToFilePath(path),
true /* recursive */,
new WebFileSystemCallbackDispatcher(callbacks));
}
@@ -64,7 +64,7 @@ void WebFileSystemImpl::readMetadata(const WebString& path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->ReadMetadata(GURL(path),
+ dispatcher->ReadMetadata(webkit_glue::WebStringToFilePath(path),
new WebFileSystemCallbackDispatcher(callbacks));
}
@@ -73,7 +73,7 @@ void WebFileSystemImpl::createFile(const WebString& path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->Create(GURL(path), exclusive, false,
+ dispatcher->Create(webkit_glue::WebStringToFilePath(path), exclusive, false,
false, new WebFileSystemCallbackDispatcher(callbacks));
}
@@ -82,7 +82,7 @@ void WebFileSystemImpl::createDirectory(const WebString& path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->Create(GURL(path), exclusive, true,
+ dispatcher->Create(webkit_glue::WebStringToFilePath(path), exclusive, true,
false, new WebFileSystemCallbackDispatcher(callbacks));
}
@@ -90,7 +90,7 @@ void WebFileSystemImpl::fileExists(const WebString& path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->Exists(GURL(path), false,
+ dispatcher->Exists(webkit_glue::WebStringToFilePath(path), false,
new WebFileSystemCallbackDispatcher(callbacks));
}
@@ -98,7 +98,7 @@ void WebFileSystemImpl::directoryExists(const WebString& path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->Exists(GURL(path), true,
+ dispatcher->Exists(webkit_glue::WebStringToFilePath(path), true,
new WebFileSystemCallbackDispatcher(callbacks));
}
@@ -106,11 +106,11 @@ void WebFileSystemImpl::readDirectory(const WebString& path,
WebFileSystemCallbacks* callbacks) {
FileSystemDispatcher* dispatcher =
ChildThread::current()->file_system_dispatcher();
- dispatcher->ReadDirectory(GURL(path),
+ dispatcher->ReadDirectory(webkit_glue::WebStringToFilePath(path),
new WebFileSystemCallbackDispatcher(callbacks));
}
WebKit::WebFileWriter* WebFileSystemImpl::createFileWriter(
const WebString& path, WebKit::WebFileWriterClient* client) {
- return new WebFileWriterImpl(GURL(path), client);
+ return new WebFileWriterImpl(path, client);
}