| Index: ppapi/proxy/plugin_resource.h
|
| diff --git a/ppapi/proxy/plugin_resource.h b/ppapi/proxy/plugin_resource.h
|
| index 33d1996a122edc02ffe02978e1145c9586b8a85b..bfd41b5bac0e983054de95247d75f660ce25dc8a 100644
|
| --- a/ppapi/proxy/plugin_resource.h
|
| +++ b/ppapi/proxy/plugin_resource.h
|
| @@ -124,6 +124,11 @@ class PPAPI_PROXY_EXPORT PluginResource : public Resource {
|
| int32_t SyncCall(
|
| Destination dest, const IPC::Message& msg, A* a, B* b, C* c, D* d, E* e);
|
|
|
| + int32_t GenericSyncCall(Destination dest,
|
| + const IPC::Message& msg,
|
| + IPC::Message* reply_msg,
|
| + ResourceMessageReplyParams* reply_params);
|
| +
|
| private:
|
| // Helper function to send a |PpapiHostMsg_ResourceCall| to the given
|
| // destination with |nested_msg| and |call_params|.
|
| @@ -131,10 +136,6 @@ class PPAPI_PROXY_EXPORT PluginResource : public Resource {
|
| const ResourceMessageCallParams& call_params,
|
| const IPC::Message& nested_msg);
|
|
|
| - int32_t GenericSyncCall(Destination dest,
|
| - const IPC::Message& msg,
|
| - IPC::Message* reply_msg);
|
| -
|
| int32_t GetNextSequence();
|
|
|
| Connection connection_;
|
| @@ -170,14 +171,16 @@ int32_t PluginResource::Call(Destination dest,
|
| template <class ReplyMsgClass>
|
| int32_t PluginResource::SyncCall(Destination dest, const IPC::Message& msg) {
|
| IPC::Message reply;
|
| - return GenericSyncCall(dest, msg, &reply);
|
| + ResourceMessageReplyParams reply_params;
|
| + return GenericSyncCall(dest, msg, &reply, &reply_params);
|
| }
|
|
|
| template <class ReplyMsgClass, class A>
|
| int32_t PluginResource::SyncCall(
|
| Destination dest, const IPC::Message& msg, A* a) {
|
| IPC::Message reply;
|
| - int32_t result = GenericSyncCall(dest, msg, &reply);
|
| + ResourceMessageReplyParams reply_params;
|
| + int32_t result = GenericSyncCall(dest, msg, &reply, &reply_params);
|
|
|
| if (UnpackMessage<ReplyMsgClass>(reply, a))
|
| return result;
|
| @@ -188,7 +191,8 @@ template <class ReplyMsgClass, class A, class B>
|
| int32_t PluginResource::SyncCall(
|
| Destination dest, const IPC::Message& msg, A* a, B* b) {
|
| IPC::Message reply;
|
| - int32_t result = GenericSyncCall(dest, msg, &reply);
|
| + ResourceMessageReplyParams reply_params;
|
| + int32_t result = GenericSyncCall(dest, msg, &reply, &reply_params);
|
|
|
| if (UnpackMessage<ReplyMsgClass>(reply, a, b))
|
| return result;
|
| @@ -199,7 +203,8 @@ template <class ReplyMsgClass, class A, class B, class C>
|
| int32_t PluginResource::SyncCall(
|
| Destination dest, const IPC::Message& msg, A* a, B* b, C* c) {
|
| IPC::Message reply;
|
| - int32_t result = GenericSyncCall(dest, msg, &reply);
|
| + ResourceMessageReplyParams reply_params;
|
| + int32_t result = GenericSyncCall(dest, msg, &reply, &reply_params);
|
|
|
| if (UnpackMessage<ReplyMsgClass>(reply, a, b, c))
|
| return result;
|
| @@ -210,7 +215,8 @@ template <class ReplyMsgClass, class A, class B, class C, class D>
|
| int32_t PluginResource::SyncCall(
|
| Destination dest, const IPC::Message& msg, A* a, B* b, C* c, D* d) {
|
| IPC::Message reply;
|
| - int32_t result = GenericSyncCall(dest, msg, &reply);
|
| + ResourceMessageReplyParams reply_params;
|
| + int32_t result = GenericSyncCall(dest, msg, &reply, &reply_params);
|
|
|
| if (UnpackMessage<ReplyMsgClass>(reply, a, b, c, d))
|
| return result;
|
| @@ -221,7 +227,8 @@ template <class ReplyMsgClass, class A, class B, class C, class D, class E>
|
| int32_t PluginResource::SyncCall(
|
| Destination dest, const IPC::Message& msg, A* a, B* b, C* c, D* d, E* e) {
|
| IPC::Message reply;
|
| - int32_t result = GenericSyncCall(dest, msg, &reply);
|
| + ResourceMessageReplyParams reply_params;
|
| + int32_t result = GenericSyncCall(dest, msg, &reply, &reply_params);
|
|
|
| if (UnpackMessage<ReplyMsgClass>(reply, a, b, c, d, e))
|
| return result;
|
|
|