Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: webkit/fileapi/sandboxed_file_system_operation.cc

Issue 4821005: Make FileSystemOperation's lifetime more explicit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/fileapi/sandboxed_file_system_operation.cc
diff --git a/webkit/fileapi/sandboxed_file_system_operation.cc b/webkit/fileapi/sandboxed_file_system_operation.cc
index fc77ce319a6a00182cb14adbce171a72ff396fa7..1acac0cf56608b965c1b244157eebcc3b28f0d26 100644
--- a/webkit/fileapi/sandboxed_file_system_operation.cc
+++ b/webkit/fileapi/sandboxed_file_system_operation.cc
@@ -126,7 +126,7 @@ void SandboxedFileSystemOperation::TouchFile(const FilePath& path,
void SandboxedFileSystemOperation::DidGetRootPath(
bool success, const FilePath& path, const std::string& name) {
DCHECK(success || path.empty());
- dispatcher()->DidOpenFileSystem(name, path);
+ destructive_dispatcher()->DidOpenFileSystem(name, path);
}
bool SandboxedFileSystemOperation::VerifyFileSystemPathForRead(
@@ -135,7 +135,7 @@ bool SandboxedFileSystemOperation::VerifyFileSystemPathForRead(
// |path| is under the valid FileSystem root path for this host context.
if (!file_system_context_->path_manager()->CrackFileSystemPath(
path, NULL, NULL, NULL)) {
- dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
+ destructive_dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
return false;
}
return true;
@@ -147,25 +147,25 @@ bool SandboxedFileSystemOperation::VerifyFileSystemPathForWrite(
FilePath virtual_path;
if (!file_system_context_->path_manager()->CrackFileSystemPath(
path, &origin_url, NULL, &virtual_path)) {
- dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
+ destructive_dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
return false;
}
// Any write access is disallowed on the root path.
if (virtual_path.value().length() == 0 ||
virtual_path.DirName().value() == virtual_path.value()) {
- dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
+ destructive_dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
return false;
}
if (create && file_system_context_->path_manager()->IsRestrictedFileName(
path.BaseName())) {
- dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
+ destructive_dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
return false;
}
// TODO(kinuko): For operations with kUnknownSize we'll eventually
// need to resolve what amount of size it's going to write.
if (!file_system_context_->quota_manager()->CheckOriginQuota(
origin_url, growth)) {
- dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_NO_SPACE);
+ destructive_dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_NO_SPACE);
return false;
}
return true;
@@ -175,7 +175,7 @@ bool SandboxedFileSystemOperation::CheckIfFilePathIsSafe(
const FilePath& path) {
if (file_system_context_->path_manager()->IsRestrictedFileName(
path.BaseName())) {
- dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
+ destructive_dispatcher()->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
return false;
}
return true;

Powered by Google App Engine
This is Rietveld 408576698