| 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 42836d992d691d2fd84b27800acb5ea7ac4bc194..91f34ac0d2f31282390e1b376d421b748fbf48b2 100644
|
| --- a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
|
| +++ b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -// From private/ppb_content_decryptor_private.idl,
|
| -// modified Wed Feb 26 16:37:47 2014.
|
| +// From private/ppb_content_decryptor_private.idl modified Mon Apr 7 08:56:43
|
| +// 2014.
|
|
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/c/private/ppb_content_decryptor_private.h"
|
| @@ -34,10 +34,8 @@ void SessionMessage(PP_Instance instance,
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->SessionMessage(instance,
|
| - session_id,
|
| - message,
|
| - destination_url);
|
| + enter.functions()->SessionMessage(
|
| + instance, session_id, message, destination_url);
|
| }
|
|
|
| void SessionReady(PP_Instance instance, uint32_t session_id) {
|
| @@ -64,10 +62,8 @@ void SessionError(PP_Instance instance,
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->SessionError(instance,
|
| - session_id,
|
| - media_error,
|
| - system_code);
|
| + enter.functions()->SessionError(
|
| + instance, session_id, media_error, system_code);
|
| }
|
|
|
| void DeliverBlock(PP_Instance instance,
|
| @@ -77,9 +73,8 @@ void DeliverBlock(PP_Instance instance,
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->DeliverBlock(instance,
|
| - decrypted_block,
|
| - decrypted_block_info);
|
| + enter.functions()->DeliverBlock(
|
| + instance, decrypted_block, decrypted_block_info);
|
| }
|
|
|
| void DecoderInitializeDone(PP_Instance instance,
|
| @@ -90,10 +85,8 @@ void DecoderInitializeDone(PP_Instance instance,
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->DecoderInitializeDone(instance,
|
| - decoder_type,
|
| - request_id,
|
| - success);
|
| + enter.functions()->DecoderInitializeDone(
|
| + instance, decoder_type, request_id, success);
|
| }
|
|
|
| void DecoderDeinitializeDone(PP_Instance instance,
|
| @@ -103,9 +96,8 @@ void DecoderDeinitializeDone(PP_Instance instance,
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->DecoderDeinitializeDone(instance,
|
| - decoder_type,
|
| - request_id);
|
| + enter.functions()->DecoderDeinitializeDone(
|
| + instance, decoder_type, request_id);
|
| }
|
|
|
| void DecoderResetDone(PP_Instance instance,
|
| @@ -125,9 +117,8 @@ void DeliverFrame(PP_Instance instance,
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->DeliverFrame(instance,
|
| - decrypted_frame,
|
| - decrypted_frame_info);
|
| + enter.functions()->DeliverFrame(
|
| + instance, decrypted_frame, decrypted_frame_info);
|
| }
|
|
|
| void DeliverSamples(
|
| @@ -138,30 +129,29 @@ void DeliverSamples(
|
| EnterInstance enter(instance);
|
| if (enter.failed())
|
| return;
|
| - enter.functions()->DeliverSamples(instance,
|
| - audio_frames,
|
| - decrypted_sample_info);
|
| + enter.functions()->DeliverSamples(
|
| + instance, audio_frames, decrypted_sample_info);
|
| }
|
|
|
| const PPB_ContentDecryptor_Private_0_11
|
| - g_ppb_contentdecryptor_private_thunk_0_11 = {
|
| - &SessionCreated,
|
| - &SessionMessage,
|
| - &SessionReady,
|
| - &SessionClosed,
|
| - &SessionError,
|
| - &DeliverBlock,
|
| - &DecoderInitializeDone,
|
| - &DecoderDeinitializeDone,
|
| - &DecoderResetDone,
|
| - &DeliverFrame,
|
| - &DeliverSamples
|
| + g_ppb_contentdecryptor_private_thunk_0_11 = { //
|
| + &SessionCreated, //
|
| + &SessionMessage, //
|
| + &SessionReady, //
|
| + &SessionClosed, //
|
| + &SessionError, //
|
| + &DeliverBlock, //
|
| + &DecoderInitializeDone, //
|
| + &DecoderDeinitializeDone, //
|
| + &DecoderResetDone, //
|
| + &DeliverFrame, //
|
| + &DeliverSamples //
|
| };
|
|
|
| } // namespace
|
|
|
| PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_11*
|
| - GetPPB_ContentDecryptor_Private_0_11_Thunk() {
|
| +GetPPB_ContentDecryptor_Private_0_11_Thunk() {
|
| return &g_ppb_contentdecryptor_private_thunk_0_11;
|
| }
|
|
|
|
|