| OLD | NEW | 
|     1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |     1 // Copyright (c) 2011 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" | 
|    11 #include "base/process.h" |    11 #include "base/process.h" | 
|    12 #include "base/shared_memory.h" |    12 #include "base/shared_memory.h" | 
|    13 #include "base/string16.h" |    13 #include "base/string16.h" | 
|    14 #include "base/sync_socket.h" |    14 #include "base/sync_socket.h" | 
|    15 #include "gpu/command_buffer/common/command_buffer.h" |    15 #include "gpu/command_buffer/common/command_buffer.h" | 
|    16 #include "gpu/ipc/gpu_command_buffer_traits.h" |    16 #include "gpu/ipc/gpu_command_buffer_traits.h" | 
|    17 #include "ipc/ipc_channel_handle.h" |    17 #include "ipc/ipc_channel_handle.h" | 
|    18 #include "ipc/ipc_message_macros.h" |    18 #include "ipc/ipc_message_macros.h" | 
|    19 #include "ipc/ipc_message_utils.h" |    19 #include "ipc/ipc_message_utils.h" | 
|    20 #include "ipc/ipc_platform_file.h" |    20 #include "ipc/ipc_platform_file.h" | 
|    21 #include "ppapi/c/dev/pp_video_capture_dev.h" |    21 #include "ppapi/c/dev/pp_video_capture_dev.h" | 
 |    22 #include "ppapi/c/dev/ppb_text_input_dev.h" | 
|    22 #include "ppapi/c/pp_bool.h" |    23 #include "ppapi/c/pp_bool.h" | 
|    23 #include "ppapi/c/pp_file_info.h" |    24 #include "ppapi/c/pp_file_info.h" | 
|    24 #include "ppapi/c/pp_instance.h" |    25 #include "ppapi/c/pp_instance.h" | 
|    25 #include "ppapi/c/pp_module.h" |    26 #include "ppapi/c/pp_module.h" | 
|    26 #include "ppapi/c/pp_point.h" |    27 #include "ppapi/c/pp_point.h" | 
|    27 #include "ppapi/c/pp_rect.h" |    28 #include "ppapi/c/pp_rect.h" | 
|    28 #include "ppapi/c/pp_resource.h" |    29 #include "ppapi/c/pp_resource.h" | 
|    29 #include "ppapi/c/pp_size.h" |    30 #include "ppapi/c/pp_size.h" | 
|    30 #include "ppapi/c/dev/pp_video_dev.h" |    31 #include "ppapi/c/dev/pp_video_dev.h" | 
|    31 #include "ppapi/c/private/ppb_flash_tcp_socket.h" |    32 #include "ppapi/c/private/ppb_flash_tcp_socket.h" | 
|    32 #include "ppapi/proxy/ppapi_param_traits.h" |    33 #include "ppapi/proxy/ppapi_param_traits.h" | 
|    33 #include "ppapi/proxy/ppapi_proxy_export.h" |    34 #include "ppapi/proxy/ppapi_proxy_export.h" | 
|    34 #include "ppapi/proxy/serialized_flash_menu.h" |    35 #include "ppapi/proxy/serialized_flash_menu.h" | 
|    35 #include "ppapi/proxy/serialized_structs.h" |    36 #include "ppapi/proxy/serialized_structs.h" | 
|    36 #include "ppapi/shared_impl/input_event_impl.h" |    37 #include "ppapi/shared_impl/input_event_impl.h" | 
|    37 #include "ppapi/shared_impl/ppapi_preferences.h" |    38 #include "ppapi/shared_impl/ppapi_preferences.h" | 
|    38 #include "ppapi/shared_impl/url_request_info_impl.h" |    39 #include "ppapi/shared_impl/url_request_info_impl.h" | 
|    39  |    40  | 
|    40 #undef IPC_MESSAGE_EXPORT |    41 #undef IPC_MESSAGE_EXPORT | 
|    41 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT |    42 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT | 
|    42  |    43  | 
|    43 #define IPC_MESSAGE_START PpapiMsgStart |    44 #define IPC_MESSAGE_START PpapiMsgStart | 
|    44  |    45  | 
|    45 IPC_ENUM_TRAITS(PP_InputEvent_Type) |    46 IPC_ENUM_TRAITS(PP_InputEvent_Type) | 
|    46 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) |    47 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) | 
 |    48 IPC_ENUM_TRAITS(PP_TextInput_Type) | 
|    47 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) |    49 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) | 
|    48 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev) |    50 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev) | 
|    49  |    51  | 
|    50 IPC_STRUCT_TRAITS_BEGIN(PP_Point) |    52 IPC_STRUCT_TRAITS_BEGIN(PP_Point) | 
|    51   IPC_STRUCT_TRAITS_MEMBER(x) |    53   IPC_STRUCT_TRAITS_MEMBER(x) | 
|    52   IPC_STRUCT_TRAITS_MEMBER(y) |    54   IPC_STRUCT_TRAITS_MEMBER(y) | 
|    53 IPC_STRUCT_TRAITS_END() |    55 IPC_STRUCT_TRAITS_END() | 
|    54  |    56  | 
|    55 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) |    57 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) | 
|    56   IPC_STRUCT_TRAITS_MEMBER(x) |    58   IPC_STRUCT_TRAITS_MEMBER(x) | 
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   106   IPC_STRUCT_TRAITS_MEMBER(event_modifiers) |   108   IPC_STRUCT_TRAITS_MEMBER(event_modifiers) | 
|   107   IPC_STRUCT_TRAITS_MEMBER(mouse_button) |   109   IPC_STRUCT_TRAITS_MEMBER(mouse_button) | 
|   108   IPC_STRUCT_TRAITS_MEMBER(mouse_position) |   110   IPC_STRUCT_TRAITS_MEMBER(mouse_position) | 
|   109   IPC_STRUCT_TRAITS_MEMBER(mouse_click_count) |   111   IPC_STRUCT_TRAITS_MEMBER(mouse_click_count) | 
|   110   IPC_STRUCT_TRAITS_MEMBER(mouse_movement) |   112   IPC_STRUCT_TRAITS_MEMBER(mouse_movement) | 
|   111   IPC_STRUCT_TRAITS_MEMBER(wheel_delta) |   113   IPC_STRUCT_TRAITS_MEMBER(wheel_delta) | 
|   112   IPC_STRUCT_TRAITS_MEMBER(wheel_ticks) |   114   IPC_STRUCT_TRAITS_MEMBER(wheel_ticks) | 
|   113   IPC_STRUCT_TRAITS_MEMBER(wheel_scroll_by_page) |   115   IPC_STRUCT_TRAITS_MEMBER(wheel_scroll_by_page) | 
|   114   IPC_STRUCT_TRAITS_MEMBER(key_code) |   116   IPC_STRUCT_TRAITS_MEMBER(key_code) | 
|   115   IPC_STRUCT_TRAITS_MEMBER(character_text) |   117   IPC_STRUCT_TRAITS_MEMBER(character_text) | 
 |   118   IPC_STRUCT_TRAITS_MEMBER(composition_segment_offsets) | 
 |   119   IPC_STRUCT_TRAITS_MEMBER(composition_target_segment) | 
 |   120   IPC_STRUCT_TRAITS_MEMBER(composition_selection_start) | 
 |   121   IPC_STRUCT_TRAITS_MEMBER(composition_selection_end) | 
|   116 IPC_STRUCT_TRAITS_END() |   122 IPC_STRUCT_TRAITS_END() | 
|   117  |   123  | 
|   118 IPC_STRUCT_TRAITS_BEGIN(ppapi::PPB_URLRequestInfo_Data) |   124 IPC_STRUCT_TRAITS_BEGIN(ppapi::PPB_URLRequestInfo_Data) | 
|   119   IPC_STRUCT_TRAITS_MEMBER(url) |   125   IPC_STRUCT_TRAITS_MEMBER(url) | 
|   120   IPC_STRUCT_TRAITS_MEMBER(method) |   126   IPC_STRUCT_TRAITS_MEMBER(method) | 
|   121   IPC_STRUCT_TRAITS_MEMBER(headers) |   127   IPC_STRUCT_TRAITS_MEMBER(headers) | 
|   122   IPC_STRUCT_TRAITS_MEMBER(stream_to_file) |   128   IPC_STRUCT_TRAITS_MEMBER(stream_to_file) | 
|   123   IPC_STRUCT_TRAITS_MEMBER(follow_redirects) |   129   IPC_STRUCT_TRAITS_MEMBER(follow_redirects) | 
|   124   IPC_STRUCT_TRAITS_MEMBER(record_download_progress) |   130   IPC_STRUCT_TRAITS_MEMBER(record_download_progress) | 
|   125   IPC_STRUCT_TRAITS_MEMBER(record_upload_progress) |   131   IPC_STRUCT_TRAITS_MEMBER(record_upload_progress) | 
| (...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   915 IPC_SYNC_MESSAGE_ROUTED3_1( |   921 IPC_SYNC_MESSAGE_ROUTED3_1( | 
|   916     PpapiHostMsg_PPBTesting_ReadImageData, |   922     PpapiHostMsg_PPBTesting_ReadImageData, | 
|   917     ppapi::HostResource /* device_context_2d */, |   923     ppapi::HostResource /* device_context_2d */, | 
|   918     ppapi::HostResource /* image */, |   924     ppapi::HostResource /* image */, | 
|   919     PP_Point /* top_left */, |   925     PP_Point /* top_left */, | 
|   920     PP_Bool /* result */) |   926     PP_Bool /* result */) | 
|   921 IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBTesting_GetLiveObjectsForInstance, |   927 IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBTesting_GetLiveObjectsForInstance, | 
|   922                            PP_Instance /* instance */, |   928                            PP_Instance /* instance */, | 
|   923                            uint32 /* result */) |   929                            uint32 /* result */) | 
|   924  |   930  | 
 |   931 // PPB_TextInput. | 
 |   932 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBTextInput_SetTextInputType, | 
 |   933                     PP_Instance /* instance */, | 
 |   934                     PP_TextInput_Type /* type */) | 
 |   935 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBTextInput_UpdateCaretPosition, | 
 |   936                     PP_Instance /* instance */, | 
 |   937                     PP_Rect /* caret */, | 
 |   938                     PP_Rect /* bounding_box */) | 
 |   939 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBTextInput_CancelCompositionText, | 
 |   940                     PP_Instance /* instance */) | 
 |   941  | 
|   925 // PPB_URLLoader. |   942 // PPB_URLLoader. | 
|   926 IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBURLLoader_Create, |   943 IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBURLLoader_Create, | 
|   927                            PP_Instance /* instance */, |   944                            PP_Instance /* instance */, | 
|   928                            ppapi::HostResource /* result */) |   945                            ppapi::HostResource /* result */) | 
|   929 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBURLLoader_Open, |   946 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBURLLoader_Open, | 
|   930                     ppapi::HostResource /* loader */, |   947                     ppapi::HostResource /* loader */, | 
|   931                     ppapi::PPB_URLRequestInfo_Data /* request_data */, |   948                     ppapi::PPB_URLRequestInfo_Data /* request_data */, | 
|   932                     uint32_t /* serialized_callback */) |   949                     uint32_t /* serialized_callback */) | 
|   933 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBURLLoader_FollowRedirect, |   950 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBURLLoader_FollowRedirect, | 
|   934                     ppapi::HostResource /* loader */, |   951                     ppapi::HostResource /* loader */, | 
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1084                     std::vector<PP_PictureBuffer_Dev> /* picture buffers */) |  1101                     std::vector<PP_PictureBuffer_Dev> /* picture buffers */) | 
|  1085 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoDecoder_ReusePictureBuffer, |  1102 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoDecoder_ReusePictureBuffer, | 
|  1086                     ppapi::HostResource /* video_decoder */, |  1103                     ppapi::HostResource /* video_decoder */, | 
|  1087                     int32_t /* picture buffer id */) |  1104                     int32_t /* picture buffer id */) | 
|  1088 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Flush, |  1105 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Flush, | 
|  1089                     ppapi::HostResource /* video_decoder */) |  1106                     ppapi::HostResource /* video_decoder */) | 
|  1090 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Reset, |  1107 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Reset, | 
|  1091                     ppapi::HostResource /* video_decoder */) |  1108                     ppapi::HostResource /* video_decoder */) | 
|  1092 IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBVideoDecoder_Destroy, |  1109 IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBVideoDecoder_Destroy, | 
|  1093                            ppapi::HostResource /* video_decoder */) |  1110                            ppapi::HostResource /* video_decoder */) | 
| OLD | NEW |