diff options
| -rw-r--r-- | ppapi/proxy/plugin_var_tracker.cc | 3 | ||||
| -rw-r--r-- | ppapi/proxy/ppapi_messages.h | 5 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_var_deprecated_proxy.cc | 3 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_var_deprecated_proxy.h | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/ppapi/proxy/plugin_var_tracker.cc b/ppapi/proxy/plugin_var_tracker.cc index 06db224..81f313c 100644 --- a/ppapi/proxy/plugin_var_tracker.cc +++ b/ppapi/proxy/plugin_var_tracker.cc @@ -456,10 +456,9 @@ PP_Var PluginVarTracker::GetOrCreateObjectVarID(ProxyObjectVar* object) { void PluginVarTracker::SendAddRefObjectMsg( const ProxyObjectVar& proxy_object) { - int unused; if (proxy_object.dispatcher()) { proxy_object.dispatcher()->Send(new PpapiHostMsg_PPBVar_AddRefObject( - API_ID_PPB_VAR_DEPRECATED, proxy_object.host_var_id(), &unused)); + API_ID_PPB_VAR_DEPRECATED, proxy_object.host_var_id())); } } diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index 406d66b..3b29eea 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -1010,9 +1010,8 @@ IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_UpdateSurroundingText, uint32_t /* anchor */) // PPB_Var. -IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBVar_AddRefObject, - int64 /* object_id */, - int /* unused - need a return value for sync msgs */) +IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBVar_AddRefObject, + int64 /* object_id */) IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVar_ReleaseObject, int64 /* object_id */) IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBVar_HasProperty, diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.cc b/ppapi/proxy/ppb_var_deprecated_proxy.cc index c29e152..723fb941 100644 --- a/ppapi/proxy/ppb_var_deprecated_proxy.cc +++ b/ppapi/proxy/ppb_var_deprecated_proxy.cc @@ -354,8 +354,7 @@ bool PPB_Var_Deprecated_Proxy::OnMessageReceived(const IPC::Message& msg) { return handled; } -void PPB_Var_Deprecated_Proxy::OnMsgAddRefObject(int64 object_id, - int* /* unused */) { +void PPB_Var_Deprecated_Proxy::OnMsgAddRefObject(int64 object_id) { PP_Var var = { PP_VARTYPE_OBJECT }; var.value.as_id = object_id; ppb_var_impl_->AddRef(var); diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.h b/ppapi/proxy/ppb_var_deprecated_proxy.h index db62fc2..344ccd5 100644 --- a/ppapi/proxy/ppb_var_deprecated_proxy.h +++ b/ppapi/proxy/ppb_var_deprecated_proxy.h @@ -35,7 +35,7 @@ class PPB_Var_Deprecated_Proxy : public InterfaceProxy { private: // Message handlers. - void OnMsgAddRefObject(int64 object_id, int* unused); + void OnMsgAddRefObject(int64 object_id); void OnMsgReleaseObject(int64 object_id); void OnMsgHasProperty(SerializedVarReceiveInput var, SerializedVarReceiveInput name, |