| OLD | NEW |
| 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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 ppapi::proxy::SerializedVar /* session_id, String */, | 617 ppapi::proxy::SerializedVar /* session_id, String */, |
| 618 ppapi::proxy::SerializedVar /* key, ArrayBuffer */, | 618 ppapi::proxy::SerializedVar /* key, ArrayBuffer */, |
| 619 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) | 619 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) |
| 620 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest, | 620 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest, |
| 621 PP_Instance /* instance */, | 621 PP_Instance /* instance */, |
| 622 ppapi::proxy::SerializedVar /* session_id, String */) | 622 ppapi::proxy::SerializedVar /* session_id, String */) |
| 623 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt, | 623 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt, |
| 624 PP_Instance /* instance */, | 624 PP_Instance /* instance */, |
| 625 ppapi::proxy::PPPDecryptor_Buffer /* buffer */, | 625 ppapi::proxy::PPPDecryptor_Buffer /* buffer */, |
| 626 std::string /* serialized_block_info */) | 626 std::string /* serialized_block_info */) |
| 627 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_ResetVideoDecoder, |
| 628 PP_Instance /* instance */, |
| 629 uint32_t /* request_id */) |
| 630 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_StopVideoDecoder, |
| 631 PP_Instance /* instance */, |
| 632 uint32_t /* request_id */) |
| 627 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame, | 633 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame, |
| 628 PP_Instance /* instance */, | 634 PP_Instance /* instance */, |
| 629 ppapi::proxy::PPPDecryptor_Buffer /* buffer */, | 635 ppapi::proxy::PPPDecryptor_Buffer /* buffer */, |
| 630 std::string /* serialized_block_info */) | 636 std::string /* serialized_block_info */) |
| 631 | 637 |
| 632 // PPB_Talk | 638 // PPB_Talk |
| 633 IPC_MESSAGE_ROUTED3( | 639 IPC_MESSAGE_ROUTED3( |
| 634 PpapiMsg_PPBTalk_GetPermissionACK, | 640 PpapiMsg_PPBTalk_GetPermissionACK, |
| 635 uint32 /* plugin_dispatcher_id */, | 641 uint32 /* plugin_dispatcher_id */, |
| 636 PP_Resource /* resource */, | 642 PP_Resource /* resource */, |
| (...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1202 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyError, | 1208 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyError, |
| 1203 PP_Instance /* instance */, | 1209 PP_Instance /* instance */, |
| 1204 ppapi::proxy::SerializedVar /* key_system, String */, | 1210 ppapi::proxy::SerializedVar /* key_system, String */, |
| 1205 ppapi::proxy::SerializedVar /* session_id, String */, | 1211 ppapi::proxy::SerializedVar /* session_id, String */, |
| 1206 int32_t /* media_error */, | 1212 int32_t /* media_error */, |
| 1207 int32_t /* system_code */) | 1213 int32_t /* system_code */) |
| 1208 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock, | 1214 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock, |
| 1209 PP_Instance /* instance */, | 1215 PP_Instance /* instance */, |
| 1210 PP_Resource /* decrypted_block, PPB_Buffer_Dev */, | 1216 PP_Resource /* decrypted_block, PPB_Buffer_Dev */, |
| 1211 std::string /* serialized_block_info */) | 1217 std::string /* serialized_block_info */) |
| 1218 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_DecoderReset, |
| 1219 PP_Instance /* instance */, |
| 1220 uint32_t /* request_id */) |
| 1221 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_DecoderStopped, |
| 1222 PP_Instance /* instance */, |
| 1223 uint32_t /* request_id */) |
| 1212 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame, | 1224 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame, |
| 1213 PP_Instance /* instance */, | 1225 PP_Instance /* instance */, |
| 1214 PP_Resource /* decrypted_frame, PPB_Buffer_Dev */, | 1226 PP_Resource /* decrypted_frame, PPB_Buffer_Dev */, |
| 1215 std::string /* serialized_block_info */) | 1227 std::string /* serialized_block_info */) |
| 1216 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverSamples, | 1228 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverSamples, |
| 1217 PP_Instance /* instance */, | 1229 PP_Instance /* instance */, |
| 1218 PP_Resource /* decrypted_samples, PPB_Buffer_Dev */, | 1230 PP_Resource /* decrypted_samples, PPB_Buffer_Dev */, |
| 1219 std::string /* serialized_block_info */) | 1231 std::string /* serialized_block_info */) |
| 1220 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 1232 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| 1221 | 1233 |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1575 | 1587 |
| 1576 // Reply to a RequestMemory call. This supplies the shared memory handle. The | 1588 // Reply to a RequestMemory call. This supplies the shared memory handle. The |
| 1577 // actual handle is passed in the ReplyParams struct. | 1589 // actual handle is passed in the ReplyParams struct. |
| 1578 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Gamepad_SendMemory) | 1590 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Gamepad_SendMemory) |
| 1579 | 1591 |
| 1580 // Printing. | 1592 // Printing. |
| 1581 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_Create) | 1593 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_Create) |
| 1582 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_GetDefaultPrintSettings) | 1594 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_GetDefaultPrintSettings) |
| 1583 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply, | 1595 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply, |
| 1584 PP_PrintSettings_Dev /* print_settings */) | 1596 PP_PrintSettings_Dev /* print_settings */) |
| OLD | NEW |