diff options
Diffstat (limited to 'ppapi/proxy/ppp_content_decryptor_private_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppp_content_decryptor_private_proxy.cc | 85 |
1 files changed, 37 insertions, 48 deletions
diff --git a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc index 0ec1d10..91ea370 100644 --- a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc +++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc @@ -181,7 +181,7 @@ void CreateSessionAndGenerateRequest(PP_Instance instance, void LoadSession(PP_Instance instance, uint32_t promise_id, PP_SessionType session_type, - PP_Var web_session_id) { + PP_Var session_id) { HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance); if (!dispatcher) { NOTREACHED(); @@ -190,12 +190,12 @@ void LoadSession(PP_Instance instance, dispatcher->Send(new PpapiMsg_PPPContentDecryptor_LoadSession( API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, instance, promise_id, session_type, - SerializedVarSendInput(dispatcher, web_session_id))); + SerializedVarSendInput(dispatcher, session_id))); } void UpdateSession(PP_Instance instance, uint32_t promise_id, - PP_Var web_session_id, + PP_Var session_id, PP_Var response) { HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance); if (!dispatcher) { @@ -204,57 +204,53 @@ void UpdateSession(PP_Instance instance, } dispatcher->Send(new PpapiMsg_PPPContentDecryptor_UpdateSession( - API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, - instance, - promise_id, - SerializedVarSendInput(dispatcher, web_session_id), + API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, instance, promise_id, + SerializedVarSendInput(dispatcher, session_id), SerializedVarSendInput(dispatcher, response))); } void CloseSession(PP_Instance instance, uint32_t promise_id, - PP_Var web_session_id) { + PP_Var session_id) { HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance); if (!dispatcher) { NOTREACHED(); return; } - StringVar* session_id = StringVar::FromPPVar(web_session_id); - if (!session_id || - session_id->value().length() > media::limits::kMaxWebSessionIdLength) { + StringVar* session_id_string = StringVar::FromPPVar(session_id); + if (!session_id_string || + session_id_string->value().length() > + media::limits::kMaxSessionIdLength) { NOTREACHED(); return; } dispatcher->Send(new PpapiMsg_PPPContentDecryptor_CloseSession( - API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, - instance, - promise_id, - session_id->value())); + API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, instance, promise_id, + session_id_string->value())); } void RemoveSession(PP_Instance instance, uint32_t promise_id, - PP_Var web_session_id) { + PP_Var session_id) { HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance); if (!dispatcher) { NOTREACHED(); return; } - StringVar* session_id = StringVar::FromPPVar(web_session_id); - if (!session_id || - session_id->value().length() > media::limits::kMaxWebSessionIdLength) { + StringVar* session_id_string = StringVar::FromPPVar(session_id); + if (!session_id_string || + session_id_string->value().length() > + media::limits::kMaxSessionIdLength) { NOTREACHED(); return; } dispatcher->Send(new PpapiMsg_PPPContentDecryptor_RemoveSession( - API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, - instance, - promise_id, - session_id->value())); + API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, instance, promise_id, + session_id_string->value())); } void Decrypt(PP_Instance instance, @@ -576,54 +572,47 @@ void PPP_ContentDecryptor_Private_Proxy::OnMsgLoadSession( PP_Instance instance, uint32_t promise_id, PP_SessionType session_type, - SerializedVarReceiveInput web_session_id) { + SerializedVarReceiveInput session_id) { if (ppp_decryptor_impl_) { - CallWhileUnlocked( - ppp_decryptor_impl_->LoadSession, instance, promise_id, session_type, - ExtractReceivedVarAndAddRef(dispatcher(), &web_session_id)); + CallWhileUnlocked(ppp_decryptor_impl_->LoadSession, instance, promise_id, + session_type, + ExtractReceivedVarAndAddRef(dispatcher(), &session_id)); } } void PPP_ContentDecryptor_Private_Proxy::OnMsgUpdateSession( PP_Instance instance, uint32_t promise_id, - SerializedVarReceiveInput web_session_id, + SerializedVarReceiveInput session_id, SerializedVarReceiveInput response) { if (ppp_decryptor_impl_) { - CallWhileUnlocked( - ppp_decryptor_impl_->UpdateSession, - instance, - promise_id, - ExtractReceivedVarAndAddRef(dispatcher(), &web_session_id), - ExtractReceivedVarAndAddRef(dispatcher(), &response)); + CallWhileUnlocked(ppp_decryptor_impl_->UpdateSession, instance, promise_id, + ExtractReceivedVarAndAddRef(dispatcher(), &session_id), + ExtractReceivedVarAndAddRef(dispatcher(), &response)); } } void PPP_ContentDecryptor_Private_Proxy::OnMsgCloseSession( PP_Instance instance, uint32_t promise_id, - const std::string& web_session_id) { + const std::string& session_id) { if (ppp_decryptor_impl_) { - ScopedPPVar web_session_id_var(ScopedPPVar::PassRef(), - StringVar::StringToPPVar(web_session_id)); - CallWhileUnlocked(ppp_decryptor_impl_->CloseSession, - instance, - promise_id, - web_session_id_var.get()); + ScopedPPVar session_id_var(ScopedPPVar::PassRef(), + StringVar::StringToPPVar(session_id)); + CallWhileUnlocked(ppp_decryptor_impl_->CloseSession, instance, promise_id, + session_id_var.get()); } } void PPP_ContentDecryptor_Private_Proxy::OnMsgRemoveSession( PP_Instance instance, uint32_t promise_id, - const std::string& web_session_id) { + const std::string& session_id) { if (ppp_decryptor_impl_) { - ScopedPPVar web_session_id_var(ScopedPPVar::PassRef(), - StringVar::StringToPPVar(web_session_id)); - CallWhileUnlocked(ppp_decryptor_impl_->RemoveSession, - instance, - promise_id, - web_session_id_var.get()); + ScopedPPVar session_id_var(ScopedPPVar::PassRef(), + StringVar::StringToPPVar(session_id)); + CallWhileUnlocked(ppp_decryptor_impl_->RemoveSession, instance, promise_id, + session_id_var.get()); } } |