| Index: ppapi/proxy/ppapi_messages.h
|
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
|
| index 8ac08863f259be2ea620d0b02120d4302ba24e45..66e44e2aa3a4a26a07fe437409a1c20e7697a539 100644
|
| --- a/ppapi/proxy/ppapi_messages.h
|
| +++ b/ppapi/proxy/ppapi_messages.h
|
| @@ -31,6 +31,7 @@
|
| #include "ppapi/c/pp_resource.h"
|
| #include "ppapi/c/pp_size.h"
|
| #include "ppapi/c/pp_time.h"
|
| +#include "ppapi/c/private/pp_content_decryptor.h"
|
| #include "ppapi/c/private/ppb_flash.h"
|
| #include "ppapi/c/private/ppb_host_resolver_private.h"
|
| #include "ppapi/c/private/ppb_net_address_private.h"
|
| @@ -69,6 +70,7 @@ IPC_ENUM_TRAITS(PP_NetworkListType_Private)
|
| IPC_ENUM_TRAITS(PP_PrintOrientation_Dev)
|
| IPC_ENUM_TRAITS(PP_PrintOutputFormat_Dev)
|
| IPC_ENUM_TRAITS(PP_PrintScalingOption_Dev)
|
| +IPC_ENUM_TRAITS(PP_StreamType)
|
| IPC_ENUM_TRAITS(PP_TextInput_Type)
|
| IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev)
|
| IPC_ENUM_TRAITS(PP_VideoDecoder_Profile)
|
| @@ -624,6 +626,14 @@ IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt,
|
| PP_Instance /* instance */,
|
| ppapi::proxy::PPPDecryptor_Buffer /* buffer */,
|
| std::string /* serialized_block_info */)
|
| +IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DeinitializeDecoder,
|
| + PP_Instance /* instance */,
|
| + PP_StreamType /* decoder_type */,
|
| + uint32_t /* request_id */)
|
| +IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_ResetDecoder,
|
| + PP_Instance /* instance */,
|
| + PP_StreamType /* decoder_type */,
|
| + uint32_t /* request_id */)
|
| IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame,
|
| PP_Instance /* instance */,
|
| ppapi::proxy::PPPDecryptor_Buffer /* buffer */,
|
| @@ -1209,6 +1219,14 @@ IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock,
|
| PP_Instance /* instance */,
|
| PP_Resource /* decrypted_block, PPB_Buffer_Dev */,
|
| std::string /* serialized_block_info */)
|
| +IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderDeinitializeDone,
|
| + PP_Instance /* instance */,
|
| + PP_StreamType /* decoder_type */,
|
| + uint32_t /* request_id */)
|
| +IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderResetDone,
|
| + PP_Instance /* instance */,
|
| + PP_StreamType /* decoder_type */,
|
| + uint32_t /* request_id */)
|
| IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame,
|
| PP_Instance /* instance */,
|
| PP_Resource /* decrypted_frame, PPB_Buffer_Dev */,
|
|
|