Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(566)

Side by Side Diff: ppapi/proxy/ppapi_messages.h

Issue 11028087: Add decoder de-initialize and reset to the Pepper CDM API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove PP_STREAMTYPE_UNKNOWN. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Multiply-included message header, no traditional include guard. 5 // Multiply-included message header, no traditional include guard.
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 13 matching lines...) Expand all
24 #include "ppapi/c/dev/ppp_printing_dev.h" 24 #include "ppapi/c/dev/ppp_printing_dev.h"
25 #include "ppapi/c/pp_bool.h" 25 #include "ppapi/c/pp_bool.h"
26 #include "ppapi/c/pp_file_info.h" 26 #include "ppapi/c/pp_file_info.h"
27 #include "ppapi/c/pp_instance.h" 27 #include "ppapi/c/pp_instance.h"
28 #include "ppapi/c/pp_module.h" 28 #include "ppapi/c/pp_module.h"
29 #include "ppapi/c/pp_point.h" 29 #include "ppapi/c/pp_point.h"
30 #include "ppapi/c/pp_rect.h" 30 #include "ppapi/c/pp_rect.h"
31 #include "ppapi/c/pp_resource.h" 31 #include "ppapi/c/pp_resource.h"
32 #include "ppapi/c/pp_size.h" 32 #include "ppapi/c/pp_size.h"
33 #include "ppapi/c/pp_time.h" 33 #include "ppapi/c/pp_time.h"
34 #include "ppapi/c/private/pp_content_decryptor.h"
34 #include "ppapi/c/private/ppb_flash.h" 35 #include "ppapi/c/private/ppb_flash.h"
35 #include "ppapi/c/private/ppb_host_resolver_private.h" 36 #include "ppapi/c/private/ppb_host_resolver_private.h"
36 #include "ppapi/c/private/ppb_net_address_private.h" 37 #include "ppapi/c/private/ppb_net_address_private.h"
37 #include "ppapi/c/private/ppb_tcp_socket_private.h" 38 #include "ppapi/c/private/ppb_tcp_socket_private.h"
38 #include "ppapi/c/private/ppb_udp_socket_private.h" 39 #include "ppapi/c/private/ppb_udp_socket_private.h"
39 #include "ppapi/c/private/ppp_flash_browser_operations.h" 40 #include "ppapi/c/private/ppp_flash_browser_operations.h"
40 #include "ppapi/proxy/ppapi_param_traits.h" 41 #include "ppapi/proxy/ppapi_param_traits.h"
41 #include "ppapi/proxy/ppapi_proxy_export.h" 42 #include "ppapi/proxy/ppapi_proxy_export.h"
42 #include "ppapi/proxy/resource_message_params.h" 43 #include "ppapi/proxy/resource_message_params.h"
43 #include "ppapi/proxy/serialized_flash_menu.h" 44 #include "ppapi/proxy/serialized_flash_menu.h"
(...skipping 18 matching lines...) Expand all
62 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_SettingType) 63 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_SettingType)
63 IPC_ENUM_TRAITS(PP_FlashSetting) 64 IPC_ENUM_TRAITS(PP_FlashSetting)
64 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) 65 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton)
65 IPC_ENUM_TRAITS(PP_InputEvent_Type) 66 IPC_ENUM_TRAITS(PP_InputEvent_Type)
66 IPC_ENUM_TRAITS(PP_NetAddressFamily_Private) 67 IPC_ENUM_TRAITS(PP_NetAddressFamily_Private)
67 IPC_ENUM_TRAITS(PP_NetworkListState_Private) 68 IPC_ENUM_TRAITS(PP_NetworkListState_Private)
68 IPC_ENUM_TRAITS(PP_NetworkListType_Private) 69 IPC_ENUM_TRAITS(PP_NetworkListType_Private)
69 IPC_ENUM_TRAITS(PP_PrintOrientation_Dev) 70 IPC_ENUM_TRAITS(PP_PrintOrientation_Dev)
70 IPC_ENUM_TRAITS(PP_PrintOutputFormat_Dev) 71 IPC_ENUM_TRAITS(PP_PrintOutputFormat_Dev)
71 IPC_ENUM_TRAITS(PP_PrintScalingOption_Dev) 72 IPC_ENUM_TRAITS(PP_PrintScalingOption_Dev)
73 IPC_ENUM_TRAITS(PP_StreamType)
72 IPC_ENUM_TRAITS(PP_TextInput_Type) 74 IPC_ENUM_TRAITS(PP_TextInput_Type)
73 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev) 75 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev)
74 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) 76 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile)
75 77
76 IPC_STRUCT_TRAITS_BEGIN(PP_Point) 78 IPC_STRUCT_TRAITS_BEGIN(PP_Point)
77 IPC_STRUCT_TRAITS_MEMBER(x) 79 IPC_STRUCT_TRAITS_MEMBER(x)
78 IPC_STRUCT_TRAITS_MEMBER(y) 80 IPC_STRUCT_TRAITS_MEMBER(y)
79 IPC_STRUCT_TRAITS_END() 81 IPC_STRUCT_TRAITS_END()
80 82
81 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) 83 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint)
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 ppapi::proxy::SerializedVar /* session_id, String */, 619 ppapi::proxy::SerializedVar /* session_id, String */,
618 ppapi::proxy::SerializedVar /* key, ArrayBuffer */, 620 ppapi::proxy::SerializedVar /* key, ArrayBuffer */,
619 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) 621 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)
620 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest, 622 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest,
621 PP_Instance /* instance */, 623 PP_Instance /* instance */,
622 ppapi::proxy::SerializedVar /* session_id, String */) 624 ppapi::proxy::SerializedVar /* session_id, String */)
623 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt, 625 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt,
624 PP_Instance /* instance */, 626 PP_Instance /* instance */,
625 ppapi::proxy::PPPDecryptor_Buffer /* buffer */, 627 ppapi::proxy::PPPDecryptor_Buffer /* buffer */,
626 std::string /* serialized_block_info */) 628 std::string /* serialized_block_info */)
629 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DeinitializeDecoder,
630 PP_Instance /* instance */,
631 PP_StreamType /* decoder_type */,
632 uint32_t /* request_id */)
633 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_ResetDecoder,
634 PP_Instance /* instance */,
635 PP_StreamType /* decoder_type */,
636 uint32_t /* request_id */)
627 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame, 637 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame,
628 PP_Instance /* instance */, 638 PP_Instance /* instance */,
629 ppapi::proxy::PPPDecryptor_Buffer /* buffer */, 639 ppapi::proxy::PPPDecryptor_Buffer /* buffer */,
630 std::string /* serialized_block_info */) 640 std::string /* serialized_block_info */)
631 641
632 // PPB_Talk 642 // PPB_Talk
633 IPC_MESSAGE_ROUTED3( 643 IPC_MESSAGE_ROUTED3(
634 PpapiMsg_PPBTalk_GetPermissionACK, 644 PpapiMsg_PPBTalk_GetPermissionACK,
635 uint32 /* plugin_dispatcher_id */, 645 uint32 /* plugin_dispatcher_id */,
636 PP_Resource /* resource */, 646 PP_Resource /* resource */,
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyError, 1212 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyError,
1203 PP_Instance /* instance */, 1213 PP_Instance /* instance */,
1204 ppapi::proxy::SerializedVar /* key_system, String */, 1214 ppapi::proxy::SerializedVar /* key_system, String */,
1205 ppapi::proxy::SerializedVar /* session_id, String */, 1215 ppapi::proxy::SerializedVar /* session_id, String */,
1206 int32_t /* media_error */, 1216 int32_t /* media_error */,
1207 int32_t /* system_code */) 1217 int32_t /* system_code */)
1208 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock, 1218 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock,
1209 PP_Instance /* instance */, 1219 PP_Instance /* instance */,
1210 PP_Resource /* decrypted_block, PPB_Buffer_Dev */, 1220 PP_Resource /* decrypted_block, PPB_Buffer_Dev */,
1211 std::string /* serialized_block_info */) 1221 std::string /* serialized_block_info */)
1222 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderDeinitializeDone,
1223 PP_Instance /* instance */,
1224 PP_StreamType /* decoder_type */,
1225 uint32_t /* request_id */)
1226 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderResetDone,
1227 PP_Instance /* instance */,
1228 PP_StreamType /* decoder_type */,
1229 uint32_t /* request_id */)
1212 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame, 1230 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame,
1213 PP_Instance /* instance */, 1231 PP_Instance /* instance */,
1214 PP_Resource /* decrypted_frame, PPB_Buffer_Dev */, 1232 PP_Resource /* decrypted_frame, PPB_Buffer_Dev */,
1215 std::string /* serialized_block_info */) 1233 std::string /* serialized_block_info */)
1216 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverSamples, 1234 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverSamples,
1217 PP_Instance /* instance */, 1235 PP_Instance /* instance */,
1218 PP_Resource /* decrypted_samples, PPB_Buffer_Dev */, 1236 PP_Resource /* decrypted_samples, PPB_Buffer_Dev */,
1219 std::string /* serialized_block_info */) 1237 std::string /* serialized_block_info */)
1220 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 1238 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
1221 1239
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1575 1593
1576 // Reply to a RequestMemory call. This supplies the shared memory handle. The 1594 // Reply to a RequestMemory call. This supplies the shared memory handle. The
1577 // actual handle is passed in the ReplyParams struct. 1595 // actual handle is passed in the ReplyParams struct.
1578 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Gamepad_SendMemory) 1596 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Gamepad_SendMemory)
1579 1597
1580 // Printing. 1598 // Printing.
1581 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_Create) 1599 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_Create)
1582 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_GetDefaultPrintSettings) 1600 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_GetDefaultPrintSettings)
1583 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply, 1601 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply,
1584 PP_PrintSettings_Dev /* print_settings */) 1602 PP_PrintSettings_Dev /* print_settings */)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698