| 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 19bbd18705a821f136e6de0884beb4868237fa96..395d99ab09ba7a05988087f1da69af71a9171c05 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 Thu Jun 5 13:39:15 2014.
|
| +// modified Thu Aug 21 16:14:23 2014.
|
|
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/c/private/ppb_content_decryptor_private.h"
|
| @@ -36,6 +36,16 @@ void PromiseResolvedWithSession(PP_Instance instance,
|
| web_session_id);
|
| }
|
|
|
| +void PromiseResolvedWithKeyIds(PP_Instance instance,
|
| + uint32_t promise_id,
|
| + struct PP_Var key_ids) {
|
| + VLOG(4) << "PPB_ContentDecryptor_Private::PromiseResolvedWithKeyIds()";
|
| + EnterInstance enter(instance);
|
| + if (enter.failed())
|
| + return;
|
| + enter.functions()->PromiseResolvedWithKeyIds(instance, promise_id, key_ids);
|
| +}
|
| +
|
| void PromiseRejected(PP_Instance instance,
|
| uint32_t promise_id,
|
| PP_CdmExceptionCode exception_code,
|
| @@ -66,6 +76,30 @@ void SessionMessage(PP_Instance instance,
|
| destination_url);
|
| }
|
|
|
| +void SessionKeysChange(PP_Instance instance,
|
| + struct PP_Var web_session_id,
|
| + PP_Bool has_additional_usable_key) {
|
| + VLOG(4) << "PPB_ContentDecryptor_Private::SessionKeysChange()";
|
| + EnterInstance enter(instance);
|
| + if (enter.failed())
|
| + return;
|
| + enter.functions()->SessionKeysChange(instance,
|
| + web_session_id,
|
| + has_additional_usable_key);
|
| +}
|
| +
|
| +void SessionExpirationChange(PP_Instance instance,
|
| + struct PP_Var web_session_id,
|
| + PP_Time new_expiry_time) {
|
| + VLOG(4) << "PPB_ContentDecryptor_Private::SessionExpirationChange()";
|
| + EnterInstance enter(instance);
|
| + if (enter.failed())
|
| + return;
|
| + enter.functions()->SessionExpirationChange(instance,
|
| + web_session_id,
|
| + new_expiry_time);
|
| +}
|
| +
|
| void SessionReady(PP_Instance instance, struct PP_Var web_session_id) {
|
| VLOG(4) << "PPB_ContentDecryptor_Private::SessionReady()";
|
| EnterInstance enter(instance);
|
| @@ -175,8 +209,11 @@ const PPB_ContentDecryptor_Private_0_12
|
| g_ppb_contentdecryptor_private_thunk_0_12 = {
|
| &PromiseResolved,
|
| &PromiseResolvedWithSession,
|
| + &PromiseResolvedWithKeyIds,
|
| &PromiseRejected,
|
| &SessionMessage,
|
| + &SessionKeysChange,
|
| + &SessionExpirationChange,
|
| &SessionReady,
|
| &SessionClosed,
|
| &SessionError,
|
|
|