| Index: ppapi/proxy/ppp_content_decryptor_private_proxy.cc
|
| diff --git a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
|
| index e64463805ef2d94c9338a0b445ffcfb66f0cd240..3f6315f0794e9abf6f45ea0e8d2346bb1ce3304c 100644
|
| --- a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
|
| +++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
|
| @@ -112,6 +112,7 @@ bool InitializePppDecryptorBuffer(PP_Instance instance,
|
| }
|
|
|
| void Initialize(PP_Instance instance,
|
| + uint32_t promise_id,
|
| PP_Var key_system,
|
| PP_Bool allow_distinctive_identifier,
|
| PP_Bool allow_persistent_state) {
|
| @@ -121,13 +122,10 @@ void Initialize(PP_Instance instance,
|
| return;
|
| }
|
|
|
| - dispatcher->Send(
|
| - new PpapiMsg_PPPContentDecryptor_Initialize(
|
| - API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
|
| - instance,
|
| - SerializedVarSendInput(dispatcher, key_system),
|
| - allow_distinctive_identifier,
|
| - allow_persistent_state));
|
| + dispatcher->Send(new PpapiMsg_PPPContentDecryptor_Initialize(
|
| + API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, instance, promise_id,
|
| + SerializedVarSendInput(dispatcher, key_system),
|
| + allow_distinctive_identifier, allow_persistent_state));
|
| }
|
|
|
| void SetServerCertificate(PP_Instance instance,
|
| @@ -524,16 +522,14 @@ bool PPP_ContentDecryptor_Private_Proxy::OnMessageReceived(
|
|
|
| void PPP_ContentDecryptor_Private_Proxy::OnMsgInitialize(
|
| PP_Instance instance,
|
| + uint32_t promise_id,
|
| SerializedVarReceiveInput key_system,
|
| PP_Bool allow_distinctive_identifier,
|
| PP_Bool allow_persistent_state) {
|
| if (ppp_decryptor_impl_) {
|
| - CallWhileUnlocked(
|
| - ppp_decryptor_impl_->Initialize,
|
| - instance,
|
| - ExtractReceivedVarAndAddRef(dispatcher(), &key_system),
|
| - allow_distinctive_identifier,
|
| - allow_persistent_state);
|
| + CallWhileUnlocked(ppp_decryptor_impl_->Initialize, instance, promise_id,
|
| + ExtractReceivedVarAndAddRef(dispatcher(), &key_system),
|
| + allow_distinctive_identifier, allow_persistent_state);
|
| }
|
| }
|
|
|
|
|