| Index: ppapi/thunk/ppb_video_decoder_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_video_decoder_thunk.cc b/ppapi/thunk/ppb_video_decoder_thunk.cc
|
| index c2e4c7e7821743c35334bdf32d35183b03012948..14bd55a083ffd40d5de3b304a4fab1a136f5e453 100644
|
| --- a/ppapi/thunk/ppb_video_decoder_thunk.cc
|
| +++ b/ppapi/thunk/ppb_video_decoder_thunk.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -// From ppb_video_decoder.idl modified Wed Nov 5 13:39:36 2014.
|
| +// From ppb_video_decoder.idl modified Fri Nov 7 14:49:08 2014.
|
|
|
| #include "ppapi/c/pp_completion_callback.h"
|
| #include "ppapi/c/pp_errors.h"
|
| @@ -40,10 +40,8 @@ int32_t Initialize_0_1(PP_Resource video_decoder,
|
| EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true);
|
| if (enter.failed())
|
| return enter.retval();
|
| - return enter.SetResult(enter.object()->Initialize0_1(graphics3d_context,
|
| - profile,
|
| - allow_software_fallback,
|
| - enter.callback()));
|
| + return enter.SetResult(enter.object()->Initialize0_1(
|
| + graphics3d_context, profile, allow_software_fallback, enter.callback()));
|
| }
|
|
|
| int32_t Initialize(PP_Resource video_decoder,
|
| @@ -55,10 +53,8 @@ int32_t Initialize(PP_Resource video_decoder,
|
| EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true);
|
| if (enter.failed())
|
| return enter.retval();
|
| - return enter.SetResult(enter.object()->Initialize(graphics3d_context,
|
| - profile,
|
| - acceleration,
|
| - enter.callback()));
|
| + return enter.SetResult(enter.object()->Initialize(
|
| + graphics3d_context, profile, acceleration, enter.callback()));
|
| }
|
|
|
| int32_t Decode(PP_Resource video_decoder,
|
| @@ -70,10 +66,8 @@ int32_t Decode(PP_Resource video_decoder,
|
| EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true);
|
| if (enter.failed())
|
| return enter.retval();
|
| - return enter.SetResult(enter.object()->Decode(decode_id,
|
| - size,
|
| - buffer,
|
| - enter.callback()));
|
| + return enter.SetResult(
|
| + enter.object()->Decode(decode_id, size, buffer, enter.callback()));
|
| }
|
|
|
| int32_t GetPicture_0_1(PP_Resource video_decoder,
|
| @@ -153,13 +147,11 @@ const PPB_VideoDecoder_1_0 g_ppb_videodecoder_thunk_1_0 = {&Create,
|
|
|
| } // namespace
|
|
|
| -PPAPI_THUNK_EXPORT const PPB_VideoDecoder_0_1*
|
| - GetPPB_VideoDecoder_0_1_Thunk() {
|
| +PPAPI_THUNK_EXPORT const PPB_VideoDecoder_0_1* GetPPB_VideoDecoder_0_1_Thunk() {
|
| return &g_ppb_videodecoder_thunk_0_1;
|
| }
|
|
|
| -PPAPI_THUNK_EXPORT const PPB_VideoDecoder_0_2*
|
| - GetPPB_VideoDecoder_0_2_Thunk() {
|
| +PPAPI_THUNK_EXPORT const PPB_VideoDecoder_0_2* GetPPB_VideoDecoder_0_2_Thunk() {
|
| return &g_ppb_videodecoder_thunk_0_2;
|
| }
|
|
|
|
|