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

Unified Diff: trunk/src/webkit/browser/fileapi/file_system_operation_runner.cc

Issue 60323002: Revert 232547 "Pepper: Move FileIO host from renderer to browser." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
« no previous file with comments | « trunk/src/webkit/browser/fileapi/file_system_operation_runner.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/webkit/browser/fileapi/file_system_operation_runner.cc
===================================================================
--- trunk/src/webkit/browser/fileapi/file_system_operation_runner.cc (revision 233010)
+++ trunk/src/webkit/browser/fileapi/file_system_operation_runner.cc (working copy)
@@ -339,6 +339,7 @@
OperationID FileSystemOperationRunner::OpenFile(
const FileSystemURL& url,
int file_flags,
+ base::ProcessHandle peer_handle,
const OpenFileCallback& callback) {
base::PlatformFileError error = base::PLATFORM_FILE_OK;
FileSystemOperation* operation =
@@ -347,7 +348,7 @@
OperationHandle handle = BeginOperation(operation, scope.AsWeakPtr());
if (!operation) {
DidOpenFile(handle, callback, error, base::kInvalidPlatformFileValue,
- base::Closure());
+ base::Closure(), base::ProcessHandle());
return handle.id;
}
if (file_flags &
@@ -361,7 +362,7 @@
PrepareForRead(handle.id, url);
}
operation->OpenFile(
- url, file_flags,
+ url, file_flags, peer_handle,
base::Bind(&FileSystemOperationRunner::DidOpenFile, AsWeakPtr(),
handle, callback));
return handle.id;
@@ -577,16 +578,17 @@
const OpenFileCallback& callback,
base::PlatformFileError rv,
base::PlatformFile file,
- const base::Closure& on_close_callback) {
+ const base::Closure& on_close_callback,
+ base::ProcessHandle peer_handle) {
if (handle.scope) {
finished_operations_.insert(handle.id);
base::MessageLoopProxy::current()->PostTask(
FROM_HERE, base::Bind(&FileSystemOperationRunner::DidOpenFile,
AsWeakPtr(), handle, callback, rv, file,
- on_close_callback));
+ on_close_callback, peer_handle));
return;
}
- callback.Run(rv, file, on_close_callback);
+ callback.Run(rv, file, on_close_callback, peer_handle);
FinishOperation(handle.id);
}
« no previous file with comments | « trunk/src/webkit/browser/fileapi/file_system_operation_runner.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698