summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 20:37:21 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 20:37:21 +0000
commit12e9913cd1d7c2c4b3aa49ed006b33b1b1fa5515 (patch)
tree33135f3eb6a4176210de966c4f31f7e81dfec509 /ppapi/proxy
parentef452a2612cc3d1567fb54c2ac444cbaf8adcd5f (diff)
downloadchromium_src-12e9913cd1d7c2c4b3aa49ed006b33b1b1fa5515.zip
chromium_src-12e9913cd1d7c2c4b3aa49ed006b33b1b1fa5515.tar.gz
chromium_src-12e9913cd1d7c2c4b3aa49ed006b33b1b1fa5515.tar.bz2
Revert 232440 "Pepper: Move FileIO host from renderer to browser."
Broke the Linux ASAN Test (2) bot. > Pepper: Move FileIO host from renderer to browser. > > This change is large because it moves QuotaFileIO and PepperFileIOHost all at > once to the browser process. Some code in the refactored PepperFileIOHost is > moved from what's provided in FileAPIMessageFilter. > > Tested locally with Bastion, From Dust, and Angry Bots. > > TBR=jschuh > BUG=246396 > > Review URL: https://codereview.chromium.org/33053002 TBR=teravest@chromium.org Review URL: https://codereview.chromium.org/51213008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/file_io_resource.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/ppapi/proxy/file_io_resource.cc b/ppapi/proxy/file_io_resource.cc
index 09432f8..347d4ef 100644
--- a/ppapi/proxy/file_io_resource.cc
+++ b/ppapi/proxy/file_io_resource.cc
@@ -78,7 +78,7 @@ int32_t FileIOResource::ReadOp::DoWork() {
FileIOResource::FileIOResource(Connection connection, PP_Instance instance)
: PluginResource(connection, instance),
file_system_type_(PP_FILESYSTEMTYPE_INVALID) {
- SendCreate(BROWSER, PpapiHostMsg_FileIO_Create());
+ SendCreate(RENDERER, PpapiHostMsg_FileIO_Create());
}
FileIOResource::~FileIOResource() {
@@ -115,7 +115,7 @@ int32_t FileIOResource::Open(PP_Resource file_ref,
// don't want the plugin destroying it during the Open operation.
file_ref_ = enter.resource();
- Call<PpapiPluginMsg_FileIO_OpenReply>(BROWSER,
+ Call<PpapiPluginMsg_FileIO_OpenReply>(RENDERER,
PpapiHostMsg_FileIO_Open(
file_ref,
open_flags),
@@ -184,7 +184,7 @@ int32_t FileIOResource::Touch(PP_Time last_access_time,
if (rv != PP_OK)
return rv;
- Call<PpapiPluginMsg_FileIO_GeneralReply>(BROWSER,
+ Call<PpapiPluginMsg_FileIO_GeneralReply>(RENDERER,
PpapiHostMsg_FileIO_Touch(last_access_time, last_modified_time),
base::Bind(&FileIOResource::OnPluginMsgGeneralComplete, this,
callback));
@@ -233,7 +233,7 @@ int32_t FileIOResource::Write(int64_t offset,
// TODO(brettw) it would be nice to use a shared memory buffer for large
// writes rather than having to copy to a string (which will involve a number
// of extra copies to serialize over IPC).
- Call<PpapiPluginMsg_FileIO_GeneralReply>(BROWSER,
+ Call<PpapiPluginMsg_FileIO_GeneralReply>(RENDERER,
PpapiHostMsg_FileIO_Write(offset, std::string(buffer, bytes_to_write)),
base::Bind(&FileIOResource::OnPluginMsgGeneralComplete, this,
callback));
@@ -249,7 +249,7 @@ int32_t FileIOResource::SetLength(int64_t length,
if (rv != PP_OK)
return rv;
- Call<PpapiPluginMsg_FileIO_GeneralReply>(BROWSER,
+ Call<PpapiPluginMsg_FileIO_GeneralReply>(RENDERER,
PpapiHostMsg_FileIO_SetLength(length),
base::Bind(&FileIOResource::OnPluginMsgGeneralComplete, this,
callback));
@@ -264,7 +264,7 @@ int32_t FileIOResource::Flush(scoped_refptr<TrackedCallback> callback) {
if (rv != PP_OK)
return rv;
- Call<PpapiPluginMsg_FileIO_GeneralReply>(BROWSER,
+ Call<PpapiPluginMsg_FileIO_GeneralReply>(RENDERER,
PpapiHostMsg_FileIO_Flush(),
base::Bind(&FileIOResource::OnPluginMsgGeneralComplete, this,
callback));
@@ -277,7 +277,7 @@ void FileIOResource::Close() {
if (file_handle_) {
file_handle_ = NULL;
}
- Post(BROWSER, PpapiHostMsg_FileIO_Close());
+ Post(RENDERER, PpapiHostMsg_FileIO_Close());
}
int32_t FileIOResource::RequestOSFileHandle(
@@ -288,7 +288,7 @@ int32_t FileIOResource::RequestOSFileHandle(
if (rv != PP_OK)
return rv;
- Call<PpapiPluginMsg_FileIO_RequestOSFileHandleReply>(BROWSER,
+ Call<PpapiPluginMsg_FileIO_RequestOSFileHandleReply>(RENDERER,
PpapiHostMsg_FileIO_RequestOSFileHandle(),
base::Bind(&FileIOResource::OnPluginMsgRequestOSFileHandleComplete, this,
callback, handle));