Index: ppapi/proxy/ppb_instance_proxy.h |
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h |
index 2b0205199646206820efc203c928dcb59780c57d..12e56b938e5695c2fb265e36797ce10a3590410a 100644 |
--- a/ppapi/proxy/ppb_instance_proxy.h |
+++ b/ppapi/proxy/ppb_instance_proxy.h |
@@ -118,18 +118,17 @@ class PPB_Instance_Proxy : public InterfaceProxy, |
PP_Instance instance, |
PP_URLComponents_Dev* components) OVERRIDE; |
virtual void SessionCreated(PP_Instance instance, |
- uint32_t reference_id, |
- PP_Var session_id) OVERRIDE; |
+ uint32_t session_id, |
+ PP_Var web_session_id) OVERRIDE; |
virtual void SessionMessage(PP_Instance instance, |
- uint32_t reference_id, |
+ uint32_t session_id, |
PP_Var message, |
PP_Var destination_url) OVERRIDE; |
- virtual void SessionReady(PP_Instance instance, |
- uint32_t reference_id) OVERRIDE; |
+ virtual void SessionReady(PP_Instance instance, uint32_t session_id) OVERRIDE; |
virtual void SessionClosed(PP_Instance instance, |
- uint32_t reference_id) OVERRIDE; |
+ uint32_t session_id) OVERRIDE; |
virtual void SessionError(PP_Instance instance, |
- uint32_t reference_id, |
+ uint32_t session_id, |
int32_t media_error, |
int32_t system_code) OVERRIDE; |
virtual void DeliverBlock(PP_Instance instance, |
@@ -222,20 +221,20 @@ class PPB_Instance_Proxy : public InterfaceProxy, |
SerializedVarReturnValue result); |
void OnHostMsgGetPluginReferrerURL(PP_Instance instance, |
SerializedVarReturnValue result); |
- virtual void OnHostMsgSessionCreated(PP_Instance instance, |
- uint32_t reference_id, |
- SerializedVarReceiveInput session_id); |
+ virtual void OnHostMsgSessionCreated( |
+ PP_Instance instance, |
+ uint32_t session_id, |
+ SerializedVarReceiveInput web_session_id); |
virtual void OnHostMsgSessionMessage( |
PP_Instance instance, |
- uint32_t reference_id, |
+ uint32_t session_id, |
SerializedVarReceiveInput message, |
SerializedVarReceiveInput destination_url); |
- virtual void OnHostMsgSessionReady(PP_Instance instance, |
- uint32_t reference_id); |
+ virtual void OnHostMsgSessionReady(PP_Instance instance, uint32_t session_id); |
virtual void OnHostMsgSessionClosed(PP_Instance instance, |
- uint32_t reference_id); |
+ uint32_t session_id); |
virtual void OnHostMsgSessionError(PP_Instance instance, |
- uint32_t reference_id, |
+ uint32_t session_id, |
int32_t media_error, |
int32_t system_code); |
virtual void OnHostMsgDecoderInitializeDone( |