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

Unified Diff: webkit/fileapi/file_system_operation.cc

Issue 10197007: Change webkit/{fileapi,quota} code to use TaskRunner. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixesz Created 8 years, 8 months 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/file_system_operation.cc
diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index 23f87ce5b7e574946f9e6ff7de3e1aa4b41264a0..3e6318f52c615ca91de562185e42c5126fd03091 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -5,6 +5,7 @@
#include "webkit/fileapi/file_system_operation.h"
#include "base/bind.h"
+#include "base/sequenced_task_runner.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "net/base/escape.h"
@@ -82,7 +83,7 @@ FileSystemOperation::~FileSystemOperation() {
FileSystemOperationContext* c =
new FileSystemOperationContext(operation_context_);
base::FileUtilProxy::RelayClose(
- proxy_,
+ task_runner_,
base::Bind(&FileSystemFileUtil::Close,
base::Unretained(src_util_),
base::Owned(c)),
@@ -190,7 +191,7 @@ void FileSystemOperation::DirectoryExists(const GURL& path_url,
}
FileSystemFileUtilProxy::GetFileInfo(
- proxy_, &operation_context_, src_util_, src_path_,
+ task_runner_, &operation_context_, src_util_, src_path_,
base::Bind(&FileSystemOperation::DidDirectoryExists,
base::Owned(this), callback));
}
@@ -208,7 +209,7 @@ void FileSystemOperation::FileExists(const GURL& path_url,
}
FileSystemFileUtilProxy::GetFileInfo(
- proxy_, &operation_context_, src_util_, src_path_,
+ task_runner_, &operation_context_, src_util_, src_path_,
base::Bind(&FileSystemOperation::DidFileExists,
base::Owned(this), callback));
}
@@ -226,7 +227,7 @@ void FileSystemOperation::GetMetadata(const GURL& path_url,
}
FileSystemFileUtilProxy::GetFileInfo(
- proxy_, &operation_context_, src_util_, src_path_,
+ task_runner_, &operation_context_, src_util_, src_path_,
base::Bind(&FileSystemOperation::DidGetMetadata,
base::Owned(this), callback));
}
@@ -244,7 +245,7 @@ void FileSystemOperation::ReadDirectory(const GURL& path_url,
}
FileSystemFileUtilProxy::ReadDirectory(
- proxy_, &operation_context_, src_util_, src_path_,
+ task_runner_, &operation_context_, src_util_, src_path_,
base::Bind(&FileSystemOperation::DidReadDirectory,
base::Owned(this), callback));
}
@@ -265,7 +266,7 @@ void FileSystemOperation::Remove(const GURL& path_url, bool recursive,
file_system_context(), src_path_.origin(), src_path_.type()));
FileSystemFileUtilProxy::Delete(
- proxy_, &operation_context_, src_util_, src_path_, recursive,
+ task_runner_, &operation_context_, src_util_, src_path_, recursive,
base::Bind(&FileSystemOperation::DidFinishFileOperation,
base::Owned(this), callback));
}
@@ -287,7 +288,7 @@ void FileSystemOperation::Write(
}
DCHECK(blob_url.is_valid());
file_writer_delegate_.reset(new FileWriterDelegate(
- this, src_path_, offset, proxy_));
+ this, src_path_, offset, task_runner_));
set_write_callback(callback);
blob_request_.reset(
new net::URLRequest(blob_url, file_writer_delegate_.get()));
@@ -332,7 +333,7 @@ void FileSystemOperation::TouchFile(const GURL& path_url,
}
FileSystemFileUtilProxy::Touch(
- proxy_, &operation_context_, src_util_, src_path_,
+ task_runner_, &operation_context_, src_util_, src_path_,
last_access_time, last_modified_time,
base::Bind(&FileSystemOperation::DidTouchFile,
base::Owned(this), callback));
@@ -444,9 +445,9 @@ void FileSystemOperation::CreateSnapshotFile(
}
FileSystemOperation::FileSystemOperation(
- scoped_refptr<base::MessageLoopProxy> proxy,
+ base::SequencedTaskRunner* task_runner,
FileSystemContext* file_system_context)
- : proxy_(proxy),
+ : task_runner_(task_runner),
operation_context_(file_system_context),
src_util_(NULL),
dest_util_(NULL),
@@ -505,7 +506,7 @@ void FileSystemOperation::DoCreateFile(
const StatusCallback& callback,
bool exclusive) {
FileSystemFileUtilProxy::EnsureFileExists(
- proxy_, &operation_context_, src_util_, src_path_,
+ task_runner_, &operation_context_, src_util_, src_path_,
base::Bind(
exclusive ? &FileSystemOperation::DidEnsureFileExistsExclusive
: &FileSystemOperation::DidEnsureFileExistsNonExclusive,
@@ -516,14 +517,15 @@ void FileSystemOperation::DoCreateDirectory(
const StatusCallback& callback,
bool exclusive, bool recursive) {
FileSystemFileUtilProxy::CreateDirectory(
- proxy_, &operation_context_, src_util_, src_path_, exclusive, recursive,
+ task_runner_, &operation_context_,
+ src_util_, src_path_, exclusive, recursive,
base::Bind(&FileSystemOperation::DidFinishFileOperation,
base::Owned(this), callback));
}
void FileSystemOperation::DoCopy(const StatusCallback& callback) {
FileSystemFileUtilProxy::Copy(
- proxy_, &operation_context_,
+ task_runner_, &operation_context_,
src_util_, dest_util_,
src_path_, dest_path_,
base::Bind(&FileSystemOperation::DidFinishFileOperation,
@@ -532,7 +534,7 @@ void FileSystemOperation::DoCopy(const StatusCallback& callback) {
void FileSystemOperation::DoMove(const StatusCallback& callback) {
FileSystemFileUtilProxy::Move(
- proxy_, &operation_context_,
+ task_runner_, &operation_context_,
src_util_, dest_util_,
src_path_, dest_path_,
base::Bind(&FileSystemOperation::DidFinishFileOperation,
@@ -545,7 +547,7 @@ void FileSystemOperation::DoWrite() {
base::PLATFORM_FILE_ASYNC;
FileSystemFileUtilProxy::CreateOrOpen(
- proxy_, &operation_context_, src_util_, src_path_, file_flags,
+ task_runner_, &operation_context_, src_util_, src_path_, file_flags,
base::Bind(&FileSystemOperation::OnFileOpenedForWrite,
base::Unretained(this)));
}
@@ -553,7 +555,7 @@ void FileSystemOperation::DoWrite() {
void FileSystemOperation::DoTruncate(const StatusCallback& callback,
int64 length) {
FileSystemFileUtilProxy::Truncate(
- proxy_, &operation_context_, src_util_, src_path_, length,
+ task_runner_, &operation_context_, src_util_, src_path_, length,
base::Bind(&FileSystemOperation::DidFinishFileOperation,
base::Owned(this), callback));
}
@@ -561,7 +563,7 @@ void FileSystemOperation::DoTruncate(const StatusCallback& callback,
void FileSystemOperation::DoOpenFile(const OpenFileCallback& callback,
int file_flags) {
FileSystemFileUtilProxy::CreateOrOpen(
- proxy_, &operation_context_, src_util_, src_path_, file_flags,
+ task_runner_, &operation_context_, src_util_, src_path_, file_flags,
base::Bind(&FileSystemOperation::DidOpenFile,
base::Owned(this), callback));
}

Powered by Google App Engine
This is Rietveld 408576698