Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Unified Diff: ppapi/proxy/ppb_instance_proxy.cc

Issue 105383002: Rename EME WD call parameters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/ppb_instance_proxy.h ('k') | ppapi/proxy/ppp_content_decryptor_private_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppb_instance_proxy.cc
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index d6232ae87ef36162fde8d0ffbb0796e1f156bd8f..5d0e7ed3eb092b5d78bf9e6f98157fbf0bf6ec62 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -543,45 +543,45 @@ PP_Var PPB_Instance_Proxy::GetPluginReferrerURL(
}
void PPB_Instance_Proxy::SessionCreated(PP_Instance instance,
- uint32_t reference_id,
- PP_Var session_id) {
+ uint32_t session_id,
+ PP_Var web_session_id) {
dispatcher()->Send(new PpapiHostMsg_PPBInstance_SessionCreated(
API_ID_PPB_INSTANCE,
instance,
- reference_id,
- SerializedVarSendInput(dispatcher(), session_id)));
+ session_id,
+ SerializedVarSendInput(dispatcher(), web_session_id)));
}
void PPB_Instance_Proxy::SessionMessage(PP_Instance instance,
- uint32_t reference_id,
+ uint32_t session_id,
PP_Var message,
PP_Var destination_url) {
dispatcher()->Send(new PpapiHostMsg_PPBInstance_SessionMessage(
API_ID_PPB_INSTANCE,
instance,
- reference_id,
+ session_id,
SerializedVarSendInput(dispatcher(), message),
SerializedVarSendInput(dispatcher(), destination_url)));
}
void PPB_Instance_Proxy::SessionReady(PP_Instance instance,
- uint32_t reference_id) {
+ uint32_t session_id) {
dispatcher()->Send(new PpapiHostMsg_PPBInstance_SessionReady(
- API_ID_PPB_INSTANCE, instance, reference_id));
+ API_ID_PPB_INSTANCE, instance, session_id));
}
void PPB_Instance_Proxy::SessionClosed(PP_Instance instance,
- uint32_t reference_id) {
+ uint32_t session_id) {
dispatcher()->Send(new PpapiHostMsg_PPBInstance_SessionClosed(
- API_ID_PPB_INSTANCE, instance, reference_id));
+ API_ID_PPB_INSTANCE, instance, session_id));
}
void PPB_Instance_Proxy::SessionError(PP_Instance instance,
- uint32_t reference_id,
+ uint32_t session_id,
int32_t media_error,
int32_t system_code) {
dispatcher()->Send(new PpapiHostMsg_PPBInstance_SessionError(
- API_ID_PPB_INSTANCE, instance, reference_id, media_error, system_code));
+ API_ID_PPB_INSTANCE, instance, session_id, media_error, system_code));
}
void PPB_Instance_Proxy::DeliverBlock(PP_Instance instance,
@@ -1050,20 +1050,20 @@ void PPB_Instance_Proxy::OnHostMsgGetPluginReferrerURL(
void PPB_Instance_Proxy::OnHostMsgSessionCreated(
PP_Instance instance,
- uint32_t reference_id,
- SerializedVarReceiveInput session_id) {
+ uint32_t session_id,
+ SerializedVarReceiveInput web_session_id) {
if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
return;
EnterInstanceNoLock enter(instance);
if (enter.succeeded()) {
enter.functions()->SessionCreated(
- instance, reference_id, session_id.Get(dispatcher()));
+ instance, session_id, web_session_id.Get(dispatcher()));
}
}
void PPB_Instance_Proxy::OnHostMsgSessionMessage(
PP_Instance instance,
- uint32_t reference_id,
+ uint32_t session_id,
SerializedVarReceiveInput message,
SerializedVarReceiveInput destination_url) {
if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
@@ -1071,34 +1071,34 @@ void PPB_Instance_Proxy::OnHostMsgSessionMessage(
EnterInstanceNoLock enter(instance);
if (enter.succeeded()) {
enter.functions()->SessionMessage(instance,
- reference_id,
+ session_id,
message.Get(dispatcher()),
destination_url.Get(dispatcher()));
}
}
void PPB_Instance_Proxy::OnHostMsgSessionReady(PP_Instance instance,
- uint32_t reference_id) {
+ uint32_t session_id) {
if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
return;
EnterInstanceNoLock enter(instance);
if (enter.succeeded()) {
- enter.functions()->SessionReady(instance, reference_id);
+ enter.functions()->SessionReady(instance, session_id);
}
}
void PPB_Instance_Proxy::OnHostMsgSessionClosed(PP_Instance instance,
- uint32_t reference_id) {
+ uint32_t session_id) {
if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
return;
EnterInstanceNoLock enter(instance);
if (enter.succeeded()) {
- enter.functions()->SessionClosed(instance, reference_id);
+ enter.functions()->SessionClosed(instance, session_id);
}
}
void PPB_Instance_Proxy::OnHostMsgSessionError(PP_Instance instance,
- uint32_t reference_id,
+ uint32_t session_id,
int32_t media_error,
int32_t system_error) {
if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
@@ -1106,7 +1106,7 @@ void PPB_Instance_Proxy::OnHostMsgSessionError(PP_Instance instance,
EnterInstanceNoLock enter(instance);
if (enter.succeeded()) {
enter.functions()->SessionError(
- instance, reference_id, media_error, system_error);
+ instance, session_id, media_error, system_error);
}
}
« no previous file with comments | « ppapi/proxy/ppb_instance_proxy.h ('k') | ppapi/proxy/ppp_content_decryptor_private_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698