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

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

Issue 9455092: HostResolver is exposed to plugin. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed PPB_HostResolver_Private: |addr| arg in GetNetAddress can't be NULL. Created 8 years, 9 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
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 12 matching lines...) Expand all
23 #include "ppapi/c/dev/ppb_text_input_dev.h" 23 #include "ppapi/c/dev/ppb_text_input_dev.h"
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/private/ppb_host_resolver_private.h"
34 #include "ppapi/c/private/ppb_net_address_private.h"
33 #include "ppapi/c/private/ppb_tcp_socket_private.h" 35 #include "ppapi/c/private/ppb_tcp_socket_private.h"
34 #include "ppapi/proxy/ppapi_param_traits.h" 36 #include "ppapi/proxy/ppapi_param_traits.h"
35 #include "ppapi/proxy/ppapi_proxy_export.h" 37 #include "ppapi/proxy/ppapi_proxy_export.h"
36 #include "ppapi/proxy/serialized_flash_menu.h" 38 #include "ppapi/proxy/serialized_flash_menu.h"
37 #include "ppapi/proxy/serialized_structs.h" 39 #include "ppapi/proxy/serialized_structs.h"
38 #include "ppapi/shared_impl/ppapi_preferences.h" 40 #include "ppapi/shared_impl/ppapi_preferences.h"
39 #include "ppapi/shared_impl/ppb_device_ref_shared.h" 41 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
40 #include "ppapi/shared_impl/ppb_input_event_shared.h" 42 #include "ppapi/shared_impl/ppb_input_event_shared.h"
41 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" 43 #include "ppapi/shared_impl/ppb_url_request_info_shared.h"
42 #include "ppapi/shared_impl/ppb_view_shared.h" 44 #include "ppapi/shared_impl/ppb_view_shared.h"
45 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h"
43 46
44 #undef IPC_MESSAGE_EXPORT 47 #undef IPC_MESSAGE_EXPORT
45 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT 48 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT
46 49
47 #define IPC_MESSAGE_START PpapiMsgStart 50 #define IPC_MESSAGE_START PpapiMsgStart
48 51
49 IPC_ENUM_TRAITS(PP_DeviceType_Dev) 52 IPC_ENUM_TRAITS(PP_DeviceType_Dev)
53 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton)
50 IPC_ENUM_TRAITS(PP_InputEvent_Type) 54 IPC_ENUM_TRAITS(PP_InputEvent_Type)
51 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) 55 IPC_ENUM_TRAITS(PP_NetAddressFamily_Private)
52 IPC_ENUM_TRAITS(PP_TextInput_Type) 56 IPC_ENUM_TRAITS(PP_TextInput_Type)
57 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev)
53 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) 58 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile)
54 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev)
55 59
56 IPC_STRUCT_TRAITS_BEGIN(PP_Point) 60 IPC_STRUCT_TRAITS_BEGIN(PP_Point)
57 IPC_STRUCT_TRAITS_MEMBER(x) 61 IPC_STRUCT_TRAITS_MEMBER(x)
58 IPC_STRUCT_TRAITS_MEMBER(y) 62 IPC_STRUCT_TRAITS_MEMBER(y)
59 IPC_STRUCT_TRAITS_END() 63 IPC_STRUCT_TRAITS_END()
60 64
61 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) 65 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint)
62 IPC_STRUCT_TRAITS_MEMBER(x) 66 IPC_STRUCT_TRAITS_MEMBER(x)
63 IPC_STRUCT_TRAITS_MEMBER(y) 67 IPC_STRUCT_TRAITS_MEMBER(y)
64 IPC_STRUCT_TRAITS_END() 68 IPC_STRUCT_TRAITS_END()
(...skipping 23 matching lines...) Expand all
88 IPC_STRUCT_TRAITS_MEMBER(first_page_number) 92 IPC_STRUCT_TRAITS_MEMBER(first_page_number)
89 IPC_STRUCT_TRAITS_MEMBER(last_page_number) 93 IPC_STRUCT_TRAITS_MEMBER(last_page_number)
90 IPC_STRUCT_TRAITS_END() 94 IPC_STRUCT_TRAITS_END()
91 95
92 IPC_STRUCT_TRAITS_BEGIN(PP_VideoCaptureDeviceInfo_Dev) 96 IPC_STRUCT_TRAITS_BEGIN(PP_VideoCaptureDeviceInfo_Dev)
93 IPC_STRUCT_TRAITS_MEMBER(width) 97 IPC_STRUCT_TRAITS_MEMBER(width)
94 IPC_STRUCT_TRAITS_MEMBER(height) 98 IPC_STRUCT_TRAITS_MEMBER(height)
95 IPC_STRUCT_TRAITS_MEMBER(frames_per_second) 99 IPC_STRUCT_TRAITS_MEMBER(frames_per_second)
96 IPC_STRUCT_TRAITS_END() 100 IPC_STRUCT_TRAITS_END()
97 101
102 IPC_STRUCT_TRAITS_BEGIN(PP_HostResolver_Private_Hint)
103 IPC_STRUCT_TRAITS_MEMBER(family)
104 IPC_STRUCT_TRAITS_MEMBER(flags)
105 IPC_STRUCT_TRAITS_END()
106
98 IPC_STRUCT_TRAITS_BEGIN(ppapi::DeviceRefData) 107 IPC_STRUCT_TRAITS_BEGIN(ppapi::DeviceRefData)
99 IPC_STRUCT_TRAITS_MEMBER(type) 108 IPC_STRUCT_TRAITS_MEMBER(type)
100 IPC_STRUCT_TRAITS_MEMBER(name) 109 IPC_STRUCT_TRAITS_MEMBER(name)
101 IPC_STRUCT_TRAITS_MEMBER(id) 110 IPC_STRUCT_TRAITS_MEMBER(id)
102 IPC_STRUCT_TRAITS_END() 111 IPC_STRUCT_TRAITS_END()
103 112
104 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPVideoCapture_Buffer) 113 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPVideoCapture_Buffer)
105 IPC_STRUCT_TRAITS_MEMBER(resource) 114 IPC_STRUCT_TRAITS_MEMBER(resource)
106 IPC_STRUCT_TRAITS_MEMBER(handle) 115 IPC_STRUCT_TRAITS_MEMBER(handle)
107 IPC_STRUCT_TRAITS_MEMBER(size) 116 IPC_STRUCT_TRAITS_MEMBER(size)
(...skipping 29 matching lines...) Expand all
137 IPC_STRUCT_TRAITS_MEMBER(wheel_scroll_by_page) 146 IPC_STRUCT_TRAITS_MEMBER(wheel_scroll_by_page)
138 IPC_STRUCT_TRAITS_MEMBER(key_code) 147 IPC_STRUCT_TRAITS_MEMBER(key_code)
139 IPC_STRUCT_TRAITS_MEMBER(usb_key_code) 148 IPC_STRUCT_TRAITS_MEMBER(usb_key_code)
140 IPC_STRUCT_TRAITS_MEMBER(character_text) 149 IPC_STRUCT_TRAITS_MEMBER(character_text)
141 IPC_STRUCT_TRAITS_MEMBER(composition_segment_offsets) 150 IPC_STRUCT_TRAITS_MEMBER(composition_segment_offsets)
142 IPC_STRUCT_TRAITS_MEMBER(composition_target_segment) 151 IPC_STRUCT_TRAITS_MEMBER(composition_target_segment)
143 IPC_STRUCT_TRAITS_MEMBER(composition_selection_start) 152 IPC_STRUCT_TRAITS_MEMBER(composition_selection_start)
144 IPC_STRUCT_TRAITS_MEMBER(composition_selection_end) 153 IPC_STRUCT_TRAITS_MEMBER(composition_selection_end)
145 IPC_STRUCT_TRAITS_END() 154 IPC_STRUCT_TRAITS_END()
146 155
156 IPC_STRUCT_TRAITS_BEGIN(ppapi::HostPortPair)
157 IPC_STRUCT_TRAITS_MEMBER(host)
158 IPC_STRUCT_TRAITS_MEMBER(port)
159 IPC_STRUCT_TRAITS_END()
160
147 IPC_STRUCT_TRAITS_BEGIN(ppapi::PPB_URLRequestInfo_Data) 161 IPC_STRUCT_TRAITS_BEGIN(ppapi::PPB_URLRequestInfo_Data)
148 IPC_STRUCT_TRAITS_MEMBER(url) 162 IPC_STRUCT_TRAITS_MEMBER(url)
149 IPC_STRUCT_TRAITS_MEMBER(method) 163 IPC_STRUCT_TRAITS_MEMBER(method)
150 IPC_STRUCT_TRAITS_MEMBER(headers) 164 IPC_STRUCT_TRAITS_MEMBER(headers)
151 IPC_STRUCT_TRAITS_MEMBER(stream_to_file) 165 IPC_STRUCT_TRAITS_MEMBER(stream_to_file)
152 IPC_STRUCT_TRAITS_MEMBER(follow_redirects) 166 IPC_STRUCT_TRAITS_MEMBER(follow_redirects)
153 IPC_STRUCT_TRAITS_MEMBER(record_download_progress) 167 IPC_STRUCT_TRAITS_MEMBER(record_download_progress)
154 IPC_STRUCT_TRAITS_MEMBER(record_upload_progress) 168 IPC_STRUCT_TRAITS_MEMBER(record_upload_progress)
155 IPC_STRUCT_TRAITS_MEMBER(has_custom_referrer_url) 169 IPC_STRUCT_TRAITS_MEMBER(has_custom_referrer_url)
156 IPC_STRUCT_TRAITS_MEMBER(custom_referrer_url) 170 IPC_STRUCT_TRAITS_MEMBER(custom_referrer_url)
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 uint32 /* plugin_dispatcher_id */, 319 uint32 /* plugin_dispatcher_id */,
306 uint32 /* socket_id */, 320 uint32 /* socket_id */,
307 bool /* succeeded */, 321 bool /* succeeded */,
308 std::string /* data */) 322 std::string /* data */)
309 IPC_MESSAGE_ROUTED4(PpapiMsg_PPBTCPSocket_WriteACK, 323 IPC_MESSAGE_ROUTED4(PpapiMsg_PPBTCPSocket_WriteACK,
310 uint32 /* plugin_dispatcher_id */, 324 uint32 /* plugin_dispatcher_id */,
311 uint32 /* socket_id */, 325 uint32 /* socket_id */,
312 bool /* succeeded */, 326 bool /* succeeded */,
313 int32_t /* bytes_written */) 327 int32_t /* bytes_written */)
314 328
315 // PPB_UDPSocket_Private 329 // PPB_UDPSocket_Private.
316 IPC_MESSAGE_ROUTED4(PpapiMsg_PPBUDPSocket_BindACK, 330 IPC_MESSAGE_ROUTED4(PpapiMsg_PPBUDPSocket_BindACK,
317 uint32 /* plugin_dispatcher_id */, 331 uint32 /* plugin_dispatcher_id */,
318 uint32 /* socket_id */, 332 uint32 /* socket_id */,
319 bool /* succeeded */, 333 bool /* succeeded */,
320 PP_NetAddress_Private /* bound_addr */) 334 PP_NetAddress_Private /* bound_addr */)
321 IPC_MESSAGE_ROUTED5(PpapiMsg_PPBUDPSocket_RecvFromACK, 335 IPC_MESSAGE_ROUTED5(PpapiMsg_PPBUDPSocket_RecvFromACK,
322 uint32 /* plugin_dispatcher_id */, 336 uint32 /* plugin_dispatcher_id */,
323 uint32 /* socket_id */, 337 uint32 /* socket_id */,
324 bool /* succeeded */, 338 bool /* succeeded */,
325 std::string /* data */, 339 std::string /* data */,
(...skipping 17 matching lines...) Expand all
343 uint32 /* real_socket_id */, 357 uint32 /* real_socket_id */,
344 uint32 /* temp_socket_id */, 358 uint32 /* temp_socket_id */,
345 int32_t /* status */) 359 int32_t /* status */)
346 IPC_MESSAGE_ROUTED5(PpapiMsg_PPBTCPServerSocket_AcceptACK, 360 IPC_MESSAGE_ROUTED5(PpapiMsg_PPBTCPServerSocket_AcceptACK,
347 uint32 /* plugin_dispatcher_id */, 361 uint32 /* plugin_dispatcher_id */,
348 uint32 /* real_server_socket_id */, 362 uint32 /* real_server_socket_id */,
349 uint32 /* accepted_socket_id */, 363 uint32 /* accepted_socket_id */,
350 PP_NetAddress_Private /* local_addr */, 364 PP_NetAddress_Private /* local_addr */,
351 PP_NetAddress_Private /* remote_addr */) 365 PP_NetAddress_Private /* remote_addr */)
352 366
367 // PPB_HostResolver_Private.
368 IPC_MESSAGE_ROUTED5(PpapiMsg_PPBHostResolver_ResolveACK,
369 uint32 /* plugin_dispatcher_id */,
370 uint32 /* host_resolver_id */,
371 bool /* succeeded */,
372 std::string /* canonical_name */,
373 ppapi::NetworkList /* network_list */)
374
353 // PPB_Graphics2D. 375 // PPB_Graphics2D.
354 IPC_MESSAGE_ROUTED2(PpapiMsg_PPBGraphics2D_FlushACK, 376 IPC_MESSAGE_ROUTED2(PpapiMsg_PPBGraphics2D_FlushACK,
355 ppapi::HostResource /* graphics_2d */, 377 ppapi::HostResource /* graphics_2d */,
356 int32_t /* pp_error */) 378 int32_t /* pp_error */)
357 379
358 // PPB_Graphics3D. 380 // PPB_Graphics3D.
359 IPC_MESSAGE_ROUTED2(PpapiMsg_PPBGraphics3D_SwapBuffersACK, 381 IPC_MESSAGE_ROUTED2(PpapiMsg_PPBGraphics3D_SwapBuffersACK,
360 ppapi::HostResource /* graphics_3d */, 382 ppapi::HostResource /* graphics_3d */,
361 int32_t /* pp_error */) 383 int32_t /* pp_error */)
362 384
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 ppapi::HostResource /* context */, 785 ppapi::HostResource /* context */,
764 int32 /* id */) 786 int32 /* id */)
765 IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBGraphics3D_GetTransferBuffer, 787 IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBGraphics3D_GetTransferBuffer,
766 ppapi::HostResource /* context */, 788 ppapi::HostResource /* context */,
767 int32 /* id */, 789 int32 /* id */,
768 base::SharedMemoryHandle /* transfer_buffer */, 790 base::SharedMemoryHandle /* transfer_buffer */,
769 uint32 /* size */) 791 uint32 /* size */)
770 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics3D_SwapBuffers, 792 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics3D_SwapBuffers,
771 ppapi::HostResource /* graphics_3d */) 793 ppapi::HostResource /* graphics_3d */)
772 794
795 // PPB_HostResolver_Private.
796 IPC_MESSAGE_CONTROL5(PpapiHostMsg_PPBHostResolver_Resolve,
797 int32 /* routing_id */,
798 uint32 /* plugin_dispatcher_id */,
799 uint32 /* host_resolver_id */,
800 ppapi::HostPortPair /* host_port */,
801 PP_HostResolver_Private_Hint /* hint */)
802
773 // PPB_ImageData. 803 // PPB_ImageData.
774 IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_Create, 804 IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_Create,
775 PP_Instance /* instance */, 805 PP_Instance /* instance */,
776 int32 /* format */, 806 int32 /* format */,
777 PP_Size /* size */, 807 PP_Size /* size */,
778 PP_Bool /* init_to_zero */, 808 PP_Bool /* init_to_zero */,
779 ppapi::HostResource /* result_resource */, 809 ppapi::HostResource /* result_resource */,
780 std::string /* image_data_desc */, 810 std::string /* image_data_desc */,
781 ppapi::proxy::ImageHandle /* result */) 811 ppapi::proxy::ImageHandle /* result */)
782 812
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 int32_t /* backlog */) 1266 int32_t /* backlog */)
1237 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Accept, 1267 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Accept,
1238 uint32 /* real_socket_id */) 1268 uint32 /* real_socket_id */)
1239 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy, 1269 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy,
1240 uint32 /* real_socket_id */) 1270 uint32 /* real_socket_id */)
1241 1271
1242 // PPB_Font. 1272 // PPB_Font.
1243 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, 1273 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies,
1244 std::string /* result */) 1274 std::string /* result */)
1245 #endif // !defined(OS_NACL) 1275 #endif // !defined(OS_NACL)
1246
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698