Chromium Code Reviews| 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 11 matching lines...) Expand all Loading... | |
| 22 #include "ppapi/c/dev/pp_video_dev.h" | 22 #include "ppapi/c/dev/pp_video_dev.h" |
| 23 #include "ppapi/c/dev/ppb_text_input_dev.h" | 23 #include "ppapi/c/dev/ppb_text_input_dev.h" |
| 24 #include "ppapi/c/pp_bool.h" | 24 #include "ppapi/c/pp_bool.h" |
| 25 #include "ppapi/c/pp_file_info.h" | 25 #include "ppapi/c/pp_file_info.h" |
| 26 #include "ppapi/c/pp_instance.h" | 26 #include "ppapi/c/pp_instance.h" |
| 27 #include "ppapi/c/pp_module.h" | 27 #include "ppapi/c/pp_module.h" |
| 28 #include "ppapi/c/pp_point.h" | 28 #include "ppapi/c/pp_point.h" |
| 29 #include "ppapi/c/pp_rect.h" | 29 #include "ppapi/c/pp_rect.h" |
| 30 #include "ppapi/c/pp_resource.h" | 30 #include "ppapi/c/pp_resource.h" |
| 31 #include "ppapi/c/pp_size.h" | 31 #include "ppapi/c/pp_size.h" |
| 32 #include "ppapi/c/private/ppb_host_resolver_private.h" | |
| 32 #include "ppapi/c/private/ppb_tcp_socket_private.h" | 33 #include "ppapi/c/private/ppb_tcp_socket_private.h" |
| 33 #include "ppapi/proxy/ppapi_param_traits.h" | 34 #include "ppapi/proxy/ppapi_param_traits.h" |
| 34 #include "ppapi/proxy/ppapi_proxy_export.h" | 35 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 35 #include "ppapi/proxy/serialized_flash_menu.h" | 36 #include "ppapi/proxy/serialized_flash_menu.h" |
| 36 #include "ppapi/proxy/serialized_structs.h" | 37 #include "ppapi/proxy/serialized_structs.h" |
| 37 #include "ppapi/shared_impl/ppapi_preferences.h" | 38 #include "ppapi/shared_impl/ppapi_preferences.h" |
| 38 #include "ppapi/shared_impl/ppb_device_ref_shared.h" | 39 #include "ppapi/shared_impl/ppb_device_ref_shared.h" |
| 39 #include "ppapi/shared_impl/ppb_input_event_shared.h" | 40 #include "ppapi/shared_impl/ppb_input_event_shared.h" |
| 40 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" | 41 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" |
| 41 #include "ppapi/shared_impl/ppb_view_shared.h" | 42 #include "ppapi/shared_impl/ppb_view_shared.h" |
| 43 #include "ppapi/shared_impl/private/network_list.h" | |
| 42 | 44 |
| 43 #undef IPC_MESSAGE_EXPORT | 45 #undef IPC_MESSAGE_EXPORT |
| 44 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT | 46 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT |
| 45 | 47 |
| 46 #define IPC_MESSAGE_START PpapiMsgStart | 48 #define IPC_MESSAGE_START PpapiMsgStart |
| 47 | 49 |
| 48 IPC_ENUM_TRAITS(PP_DeviceType_Dev) | 50 IPC_ENUM_TRAITS(PP_DeviceType_Dev) |
| 49 IPC_ENUM_TRAITS(PP_InputEvent_Type) | 51 IPC_ENUM_TRAITS(PP_InputEvent_Type) |
| 50 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) | 52 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) |
| 51 IPC_ENUM_TRAITS(PP_TextInput_Type) | 53 IPC_ENUM_TRAITS(PP_TextInput_Type) |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 307 uint32 /* plugin_dispatcher_id */, | 309 uint32 /* plugin_dispatcher_id */, |
| 308 uint32 /* socket_id */, | 310 uint32 /* socket_id */, |
| 309 bool /* succeeded */, | 311 bool /* succeeded */, |
| 310 std::string /* data */) | 312 std::string /* data */) |
| 311 IPC_MESSAGE_ROUTED4(PpapiMsg_PPBTCPSocket_WriteACK, | 313 IPC_MESSAGE_ROUTED4(PpapiMsg_PPBTCPSocket_WriteACK, |
| 312 uint32 /* plugin_dispatcher_id */, | 314 uint32 /* plugin_dispatcher_id */, |
| 313 uint32 /* socket_id */, | 315 uint32 /* socket_id */, |
| 314 bool /* succeeded */, | 316 bool /* succeeded */, |
| 315 int32_t /* bytes_written */) | 317 int32_t /* bytes_written */) |
| 316 | 318 |
| 317 // PPB_UDPSocket_Private | 319 // PPB_UDPSocket_Private. |
| 318 IPC_MESSAGE_ROUTED4(PpapiMsg_PPBUDPSocket_BindACK, | 320 IPC_MESSAGE_ROUTED4(PpapiMsg_PPBUDPSocket_BindACK, |
| 319 uint32 /* plugin_dispatcher_id */, | 321 uint32 /* plugin_dispatcher_id */, |
| 320 uint32 /* socket_id */, | 322 uint32 /* socket_id */, |
| 321 bool /* succeeded */, | 323 bool /* succeeded */, |
| 322 PP_NetAddress_Private /* bound_addr */) | 324 PP_NetAddress_Private /* bound_addr */) |
| 323 IPC_MESSAGE_ROUTED5(PpapiMsg_PPBUDPSocket_RecvFromACK, | 325 IPC_MESSAGE_ROUTED5(PpapiMsg_PPBUDPSocket_RecvFromACK, |
| 324 uint32 /* plugin_dispatcher_id */, | 326 uint32 /* plugin_dispatcher_id */, |
| 325 uint32 /* socket_id */, | 327 uint32 /* socket_id */, |
| 326 bool /* succeeded */, | 328 bool /* succeeded */, |
| 327 std::string /* data */, | 329 std::string /* data */, |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 345 uint32 /* real_socket_id */, | 347 uint32 /* real_socket_id */, |
| 346 uint32 /* temp_socket_id */, | 348 uint32 /* temp_socket_id */, |
| 347 int32_t /* status */) | 349 int32_t /* status */) |
| 348 IPC_MESSAGE_ROUTED5(PpapiMsg_PPBTCPServerSocket_AcceptACK, | 350 IPC_MESSAGE_ROUTED5(PpapiMsg_PPBTCPServerSocket_AcceptACK, |
| 349 uint32 /* plugin_dispatcher_id */, | 351 uint32 /* plugin_dispatcher_id */, |
| 350 uint32 /* real_server_socket_id */, | 352 uint32 /* real_server_socket_id */, |
| 351 uint32 /* accepted_socket_id */, | 353 uint32 /* accepted_socket_id */, |
| 352 PP_NetAddress_Private /* local_addr */, | 354 PP_NetAddress_Private /* local_addr */, |
| 353 PP_NetAddress_Private /* remote_addr */) | 355 PP_NetAddress_Private /* remote_addr */) |
| 354 | 356 |
| 357 // PPB_HostResolver_Private. | |
| 358 IPC_MESSAGE_ROUTED3(PpapiMsg_PPBHostResolver_ResolveACK, | |
| 359 uint32 /* host_resolver_id */, | |
|
yzshen1
2012/02/28 08:29:00
You probably need to add plugin_dispatcher_id as w
ygorshenin1
2012/02/28 12:09:47
Yes, but I think it's better to do this in CL for
| |
| 360 bool /* succeeded */, | |
| 361 ppapi::NetworkList /* network_list */) | |
| 362 | |
| 355 // PPB_Graphics2D. | 363 // PPB_Graphics2D. |
| 356 IPC_MESSAGE_ROUTED2(PpapiMsg_PPBGraphics2D_FlushACK, | 364 IPC_MESSAGE_ROUTED2(PpapiMsg_PPBGraphics2D_FlushACK, |
| 357 ppapi::HostResource /* graphics_2d */, | 365 ppapi::HostResource /* graphics_2d */, |
| 358 int32_t /* pp_error */) | 366 int32_t /* pp_error */) |
| 359 | 367 |
| 360 // PPB_Graphics3D. | 368 // PPB_Graphics3D. |
| 361 IPC_MESSAGE_ROUTED2(PpapiMsg_PPBGraphics3D_SwapBuffersACK, | 369 IPC_MESSAGE_ROUTED2(PpapiMsg_PPBGraphics3D_SwapBuffersACK, |
| 362 ppapi::HostResource /* graphics_3d */, | 370 ppapi::HostResource /* graphics_3d */, |
| 363 int32_t /* pp_error */) | 371 int32_t /* pp_error */) |
| 364 | 372 |
| (...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 876 int32 /* routing_id */, | 884 int32 /* routing_id */, |
| 877 uint32 /* plugin_dispatcher_id */, | 885 uint32 /* plugin_dispatcher_id */, |
| 878 uint32 /* temp_socket_id */, | 886 uint32 /* temp_socket_id */, |
| 879 PP_NetAddress_Private /* addr */, | 887 PP_NetAddress_Private /* addr */, |
| 880 int32_t /* backlog */) | 888 int32_t /* backlog */) |
| 881 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Accept, | 889 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Accept, |
| 882 uint32 /* real_socket_id */) | 890 uint32 /* real_socket_id */) |
| 883 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy, | 891 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy, |
| 884 uint32 /* real_socket_id */) | 892 uint32 /* real_socket_id */) |
| 885 | 893 |
| 894 // PPB_HostResolver_Private. | |
| 895 IPC_MESSAGE_CONTROL5(PpapiHostMsg_PPBHostResolver_Resolve, | |
| 896 int32 /* routing_id */, | |
| 897 uint32 /* host_resolver_id */, | |
| 898 std::string /* host */, | |
| 899 uint16_t /* port */, | |
| 900 PP_HostResolver_Private_Hint /* hint */) | |
| 901 | |
| 886 // PPB_Font. | 902 // PPB_Font. |
| 887 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, | 903 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, |
| 888 std::string /* result */) | 904 std::string /* result */) |
| 889 | 905 |
| 890 // PPB_Graphics2D. | 906 // PPB_Graphics2D. |
| 891 IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics2D_Create, | 907 IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics2D_Create, |
| 892 PP_Instance /* instance */, | 908 PP_Instance /* instance */, |
| 893 PP_Size /* size */, | 909 PP_Size /* size */, |
| 894 PP_Bool /* is_always_opaque */, | 910 PP_Bool /* is_always_opaque */, |
| 895 ppapi::HostResource /* result */) | 911 ppapi::HostResource /* result */) |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1210 std::vector<PP_PictureBuffer_Dev> /* picture buffers */) | 1226 std::vector<PP_PictureBuffer_Dev> /* picture buffers */) |
| 1211 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoDecoder_ReusePictureBuffer, | 1227 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoDecoder_ReusePictureBuffer, |
| 1212 ppapi::HostResource /* video_decoder */, | 1228 ppapi::HostResource /* video_decoder */, |
| 1213 int32_t /* picture buffer id */) | 1229 int32_t /* picture buffer id */) |
| 1214 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Flush, | 1230 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Flush, |
| 1215 ppapi::HostResource /* video_decoder */) | 1231 ppapi::HostResource /* video_decoder */) |
| 1216 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Reset, | 1232 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Reset, |
| 1217 ppapi::HostResource /* video_decoder */) | 1233 ppapi::HostResource /* video_decoder */) |
| 1218 IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBVideoDecoder_Destroy, | 1234 IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBVideoDecoder_Destroy, |
| 1219 ppapi::HostResource /* video_decoder */) | 1235 ppapi::HostResource /* video_decoder */) |
| OLD | NEW |