| Index: ppapi/thunk/ppb_content_decryptor_private_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
|
| index ad9ece95b8d9b722f07c868899b3ac4c7695f910..18e109796449b9c72dcc95c1f29172410b13f93d 100644
|
| --- a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
|
| +++ b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
|
| @@ -3,7 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| // From private/ppb_content_decryptor_private.idl,
|
| -// modified Wed Nov 27 11:47:56 2013.
|
| +// modified Tue Dec 3 17:04:48 2013.
|
|
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/c/private/ppb_content_decryptor_private.h"
|
| @@ -19,57 +19,53 @@ namespace thunk {
|
| namespace {
|
|
|
| void SessionCreated(PP_Instance instance,
|
| - uint32_t reference_id,
|
| + uint32_t session_id,
|
| struct PP_Var web_session_id) {
|
| VLOG(4) << "PPB_ContentDecryptor_Private::SessionCreated()";
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->SessionCreated(instance, reference_id, web_session_id);
|
| + enter.functions()->SessionCreated(instance, session_id, web_session_id);
|
| }
|
|
|
| void SessionMessage(PP_Instance instance,
|
| - uint32_t reference_id,
|
| + uint32_t session_id,
|
| struct PP_Var message,
|
| struct PP_Var destination_url) {
|
| VLOG(4) << "PPB_ContentDecryptor_Private::SessionMessage()";
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->SessionMessage(instance,
|
| - reference_id,
|
| - message,
|
| - destination_url);
|
| + enter.functions()->SessionMessage(
|
| + instance, session_id, message, destination_url);
|
| }
|
|
|
| -void SessionReady(PP_Instance instance, uint32_t reference_id) {
|
| +void SessionReady(PP_Instance instance, uint32_t session_id) {
|
| VLOG(4) << "PPB_ContentDecryptor_Private::SessionReady()";
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->SessionReady(instance, reference_id);
|
| + enter.functions()->SessionReady(instance, session_id);
|
| }
|
|
|
| -void SessionClosed(PP_Instance instance, uint32_t reference_id) {
|
| +void SessionClosed(PP_Instance instance, uint32_t session_id) {
|
| VLOG(4) << "PPB_ContentDecryptor_Private::SessionClosed()";
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->SessionClosed(instance, reference_id);
|
| + enter.functions()->SessionClosed(instance, session_id);
|
| }
|
|
|
| void SessionError(PP_Instance instance,
|
| - uint32_t reference_id,
|
| + uint32_t session_id,
|
| int32_t media_error,
|
| int32_t system_code) {
|
| VLOG(4) << "PPB_ContentDecryptor_Private::SessionError()";
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->SessionError(instance,
|
| - reference_id,
|
| - media_error,
|
| - system_code);
|
| + enter.functions()->SessionError(
|
| + instance, session_id, media_error, system_code);
|
| }
|
|
|
| void DeliverBlock(PP_Instance instance,
|
|
|