summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-09 23:41:53 +0000
committerteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-09 23:41:53 +0000
commit44dc236c728b75906acccaf9eb83c35024c0a052 (patch)
tree1cf6c40b8d32524cf2f85623869fd4dbe7fee0bc /ppapi
parent5c1f0f47d013dc49689b86481de518eb8924a1af (diff)
downloadchromium_src-44dc236c728b75906acccaf9eb83c35024c0a052.zip
chromium_src-44dc236c728b75906acccaf9eb83c35024c0a052.tar.gz
chromium_src-44dc236c728b75906acccaf9eb83c35024c0a052.tar.bz2
Pepper: Route CreateResourceHostFromHostReply.
Reply messages from the browser to the renderer must be routed so that they end up in the correct RenderView (and eventually the PepperBrowserConnection object). This change makes PpapiHostMsg_CreateResourceHostFromHostReply consistent with PpapiHostMsg_FileRef_GetInfoForRendererReply. BUG=225441 Review URL: https://chromiumcodereview.appspot.com/18826011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppapi_messages.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 62f15de..8335415 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -1306,8 +1306,9 @@ IPC_SYNC_MESSAGE_CONTROL2_2(PpapiHostMsg_ResourceSyncCall,
// the instance of the plugin for which to create the resource for. params
// contains the sequence number for the message to track the response.
// The nested message is a ResourceHost creation message.
-IPC_MESSAGE_CONTROL4(
+IPC_MESSAGE_CONTROL5(
PpapiHostMsg_CreateResourceHostFromHost,
+ int /* routing_id */,
int /* child_process_id */,
ppapi::proxy::ResourceMessageCallParams /* params */,
PP_Instance /* instance */,
@@ -1318,8 +1319,7 @@ IPC_MESSAGE_CONTROL4(
// in the request and the ID of the pending ResourceHost which was created in
// the browser. This ID is only useful for the plugin which can attach to the
// ResourceHost in the browser.
-// TODO(teravest): Change this message to be ROUTED.
-IPC_MESSAGE_CONTROL2(
+IPC_MESSAGE_ROUTED2(
PpapiHostMsg_CreateResourceHostFromHostReply,
int32_t /* sequence */,
int /* pending_host_id */)
@@ -1825,16 +1825,16 @@ IPC_MESSAGE_CONTROL3(PpapiHostMsg_FileRef_GetInfoForRenderer,
int /* child_process_id */,
ppapi::proxy::ResourceMessageCallParams /* params */)
-// Reply to PpapiHostMsg_FileRefRenderer_GetInfo with a sequence number for
+// Reply to PpapiHostMsg_FileRef_GetInfoForRenderer with a sequence number for
// invoking the right callback, |fs_type| which indicates the file system, and
// path information in either |file_system_url_spec| (for internal file systems)
// or |external_path| (for external file systems).
// Only sent from the browser to the renderer.
IPC_MESSAGE_ROUTED4(PpapiHostMsg_FileRef_GetInfoForRendererReply,
- int32_t /* sequence */,
- PP_FileSystemType /* fs_type */,
- std::string /* file_system_url_spec */,
- base::FilePath /* external_path */)
+ int32_t /* sequence */,
+ PP_FileSystemType /* fs_type */,
+ std::string /* file_system_url_spec */,
+ base::FilePath /* external_path */)
// Flash -----------------------------------------------------------------------