| Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| index ab1beda1008774e05d7c8aeefbcc8966b0f362d3..56762d0bba0b58e56f90db8390a91b994ba9c53f 100644
|
| --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| @@ -143,7 +143,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Var_1_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VarArray_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VarArrayBuffer_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VarDictionary_1_0;
|
| -static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_0_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WebSocket_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Messaging_1_0;
|
| @@ -1927,50 +1926,6 @@ static void Pnacl_M29_PPB_VarDictionary_GetKeys(struct PP_Var* _struct_result, s
|
|
|
| /* End wrapper methods for PPB_VarDictionary_1_0 */
|
|
|
| -/* Begin wrapper methods for PPB_VideoDecoder_0_1 */
|
| -
|
| -static PP_Resource Pnacl_M36_PPB_VideoDecoder_Create(PP_Instance instance) {
|
| - const struct PPB_VideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_VideoDecoder_0_1.real_iface;
|
| - return iface->Create(instance);
|
| -}
|
| -
|
| -static PP_Bool Pnacl_M36_PPB_VideoDecoder_IsVideoDecoder(PP_Resource resource) {
|
| - const struct PPB_VideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_VideoDecoder_0_1.real_iface;
|
| - return iface->IsVideoDecoder(resource);
|
| -}
|
| -
|
| -static int32_t Pnacl_M36_PPB_VideoDecoder_Initialize(PP_Resource video_decoder, PP_Resource graphics3d_context, PP_VideoProfile profile, PP_Bool allow_software_fallback, struct PP_CompletionCallback* callback) {
|
| - const struct PPB_VideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_VideoDecoder_0_1.real_iface;
|
| - return iface->Initialize(video_decoder, graphics3d_context, profile, allow_software_fallback, *callback);
|
| -}
|
| -
|
| -static int32_t Pnacl_M36_PPB_VideoDecoder_Decode(PP_Resource video_decoder, uint32_t decode_id, uint32_t size, const void* buffer, struct PP_CompletionCallback* callback) {
|
| - const struct PPB_VideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_VideoDecoder_0_1.real_iface;
|
| - return iface->Decode(video_decoder, decode_id, size, buffer, *callback);
|
| -}
|
| -
|
| -static int32_t Pnacl_M36_PPB_VideoDecoder_GetPicture(PP_Resource video_decoder, struct PP_VideoPicture* picture, struct PP_CompletionCallback* callback) {
|
| - const struct PPB_VideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_VideoDecoder_0_1.real_iface;
|
| - return iface->GetPicture(video_decoder, picture, *callback);
|
| -}
|
| -
|
| -static void Pnacl_M36_PPB_VideoDecoder_RecyclePicture(PP_Resource video_decoder, const struct PP_VideoPicture* picture) {
|
| - const struct PPB_VideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_VideoDecoder_0_1.real_iface;
|
| - iface->RecyclePicture(video_decoder, picture);
|
| -}
|
| -
|
| -static int32_t Pnacl_M36_PPB_VideoDecoder_Flush(PP_Resource video_decoder, struct PP_CompletionCallback* callback) {
|
| - const struct PPB_VideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_VideoDecoder_0_1.real_iface;
|
| - return iface->Flush(video_decoder, *callback);
|
| -}
|
| -
|
| -static int32_t Pnacl_M36_PPB_VideoDecoder_Reset(PP_Resource video_decoder, struct PP_CompletionCallback* callback) {
|
| - const struct PPB_VideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_VideoDecoder_0_1.real_iface;
|
| - return iface->Reset(video_decoder, *callback);
|
| -}
|
| -
|
| -/* End wrapper methods for PPB_VideoDecoder_0_1 */
|
| -
|
| /* Begin wrapper methods for PPB_VideoDecoder_0_2 */
|
|
|
| static PP_Resource Pnacl_M39_PPB_VideoDecoder_Create(PP_Instance instance) {
|
| @@ -4928,17 +4883,6 @@ static const struct PPB_VarDictionary_1_0 Pnacl_Wrappers_PPB_VarDictionary_1_0 =
|
| .GetKeys = (struct PP_Var (*)(struct PP_Var dict))&Pnacl_M29_PPB_VarDictionary_GetKeys
|
| };
|
|
|
| -static const struct PPB_VideoDecoder_0_1 Pnacl_Wrappers_PPB_VideoDecoder_0_1 = {
|
| - .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M36_PPB_VideoDecoder_Create,
|
| - .IsVideoDecoder = (PP_Bool (*)(PP_Resource resource))&Pnacl_M36_PPB_VideoDecoder_IsVideoDecoder,
|
| - .Initialize = (int32_t (*)(PP_Resource video_decoder, PP_Resource graphics3d_context, PP_VideoProfile profile, PP_Bool allow_software_fallback, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_VideoDecoder_Initialize,
|
| - .Decode = (int32_t (*)(PP_Resource video_decoder, uint32_t decode_id, uint32_t size, const void* buffer, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_VideoDecoder_Decode,
|
| - .GetPicture = (int32_t (*)(PP_Resource video_decoder, struct PP_VideoPicture* picture, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_VideoDecoder_GetPicture,
|
| - .RecyclePicture = (void (*)(PP_Resource video_decoder, const struct PP_VideoPicture* picture))&Pnacl_M36_PPB_VideoDecoder_RecyclePicture,
|
| - .Flush = (int32_t (*)(PP_Resource video_decoder, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_VideoDecoder_Flush,
|
| - .Reset = (int32_t (*)(PP_Resource video_decoder, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_VideoDecoder_Reset
|
| -};
|
| -
|
| static const struct PPB_VideoDecoder_0_2 Pnacl_Wrappers_PPB_VideoDecoder_0_2 = {
|
| .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M39_PPB_VideoDecoder_Create,
|
| .IsVideoDecoder = (PP_Bool (*)(PP_Resource resource))&Pnacl_M39_PPB_VideoDecoder_IsVideoDecoder,
|
| @@ -5932,12 +5876,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VarDictionary_1_0 = {
|
| .real_iface = NULL
|
| };
|
|
|
| -static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_0_1 = {
|
| - .iface_macro = PPB_VIDEODECODER_INTERFACE_0_1,
|
| - .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_VideoDecoder_0_1,
|
| - .real_iface = NULL
|
| -};
|
| -
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_0_2 = {
|
| .iface_macro = PPB_VIDEODECODER_INTERFACE_0_2,
|
| .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_VideoDecoder_0_2,
|
| @@ -6352,7 +6290,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_VarArray_1_0,
|
| &Pnacl_WrapperInfo_PPB_VarArrayBuffer_1_0,
|
| &Pnacl_WrapperInfo_PPB_VarDictionary_1_0,
|
| - &Pnacl_WrapperInfo_PPB_VideoDecoder_0_1,
|
| &Pnacl_WrapperInfo_PPB_VideoDecoder_0_2,
|
| &Pnacl_WrapperInfo_PPB_WebSocket_1_0,
|
| &Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_3,
|
|
|