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

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

Issue 13866034: Pepper: Add VLOG support for NaCl plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change DCHECK to if. Created 7 years, 8 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
« no previous file with comments | « ppapi/proxy/plugin_main_nacl.cc ('k') | ppapi/shared_impl/ppapi_nacl_channel_args.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "ppapi/proxy/host_resolver_private_resource.h" 47 #include "ppapi/proxy/host_resolver_private_resource.h"
48 #include "ppapi/proxy/ppapi_param_traits.h" 48 #include "ppapi/proxy/ppapi_param_traits.h"
49 #include "ppapi/proxy/ppapi_proxy_export.h" 49 #include "ppapi/proxy/ppapi_proxy_export.h"
50 #include "ppapi/proxy/resource_message_params.h" 50 #include "ppapi/proxy/resource_message_params.h"
51 #include "ppapi/proxy/serialized_flash_menu.h" 51 #include "ppapi/proxy/serialized_flash_menu.h"
52 #include "ppapi/proxy/serialized_handle.h" 52 #include "ppapi/proxy/serialized_handle.h"
53 #include "ppapi/proxy/serialized_structs.h" 53 #include "ppapi/proxy/serialized_structs.h"
54 #include "ppapi/proxy/serialized_var.h" 54 #include "ppapi/proxy/serialized_var.h"
55 #include "ppapi/shared_impl/dir_contents.h" 55 #include "ppapi/shared_impl/dir_contents.h"
56 #include "ppapi/shared_impl/file_path.h" 56 #include "ppapi/shared_impl/file_path.h"
57 #include "ppapi/shared_impl/ppapi_nacl_channel_args.h"
57 #include "ppapi/shared_impl/ppapi_preferences.h" 58 #include "ppapi/shared_impl/ppapi_preferences.h"
58 #include "ppapi/shared_impl/ppb_device_ref_shared.h" 59 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
59 #include "ppapi/shared_impl/ppb_input_event_shared.h" 60 #include "ppapi/shared_impl/ppb_input_event_shared.h"
60 #include "ppapi/shared_impl/ppb_network_list_private_shared.h" 61 #include "ppapi/shared_impl/ppb_network_list_private_shared.h"
61 #include "ppapi/shared_impl/ppb_view_shared.h" 62 #include "ppapi/shared_impl/ppb_view_shared.h"
62 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" 63 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
63 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" 64 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h"
64 #include "ppapi/shared_impl/url_request_info_data.h" 65 #include "ppapi/shared_impl/url_request_info_data.h"
65 #include "ppapi/shared_impl/url_response_info_data.h" 66 #include "ppapi/shared_impl/url_response_info_data.h"
66 67
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 286
286 IPC_STRUCT_TRAITS_BEGIN(ppapi::NetworkInfo) 287 IPC_STRUCT_TRAITS_BEGIN(ppapi::NetworkInfo)
287 IPC_STRUCT_TRAITS_MEMBER(name) 288 IPC_STRUCT_TRAITS_MEMBER(name)
288 IPC_STRUCT_TRAITS_MEMBER(type) 289 IPC_STRUCT_TRAITS_MEMBER(type)
289 IPC_STRUCT_TRAITS_MEMBER(state) 290 IPC_STRUCT_TRAITS_MEMBER(state)
290 IPC_STRUCT_TRAITS_MEMBER(addresses) 291 IPC_STRUCT_TRAITS_MEMBER(addresses)
291 IPC_STRUCT_TRAITS_MEMBER(display_name) 292 IPC_STRUCT_TRAITS_MEMBER(display_name)
292 IPC_STRUCT_TRAITS_MEMBER(mtu) 293 IPC_STRUCT_TRAITS_MEMBER(mtu)
293 IPC_STRUCT_TRAITS_END() 294 IPC_STRUCT_TRAITS_END()
294 295
296 IPC_STRUCT_TRAITS_BEGIN(ppapi::PpapiNaClChannelArgs)
297 IPC_STRUCT_TRAITS_MEMBER(off_the_record)
298 IPC_STRUCT_TRAITS_MEMBER(permissions)
299 IPC_STRUCT_TRAITS_MEMBER(switch_names)
jln (very slow on Chromium) 2013/04/18 22:44:23 I like that you're having a whitelist for the swit
300 IPC_STRUCT_TRAITS_MEMBER(switch_values)
301 IPC_STRUCT_TRAITS_END()
302
295 #if !defined(OS_NACL) && !defined(NACL_WIN64) 303 #if !defined(OS_NACL) && !defined(NACL_WIN64)
296 304
297 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer) 305 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer)
298 IPC_STRUCT_TRAITS_MEMBER(resource) 306 IPC_STRUCT_TRAITS_MEMBER(resource)
299 IPC_STRUCT_TRAITS_MEMBER(handle) 307 IPC_STRUCT_TRAITS_MEMBER(handle)
300 IPC_STRUCT_TRAITS_MEMBER(size) 308 IPC_STRUCT_TRAITS_MEMBER(size)
301 IPC_STRUCT_TRAITS_END() 309 IPC_STRUCT_TRAITS_END()
302 310
303 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 311 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
304 312
305 // These are from the browser to the plugin. 313 // These are from the browser to the plugin.
306 // Loads the given plugin. 314 // Loads the given plugin.
307 IPC_MESSAGE_CONTROL2(PpapiMsg_LoadPlugin, 315 IPC_MESSAGE_CONTROL2(PpapiMsg_LoadPlugin,
308 base::FilePath /* path */, 316 base::FilePath /* path */,
309 ppapi::PpapiPermissions /* permissions */) 317 ppapi::PpapiPermissions /* permissions */)
310 318
311 // Creates a channel to talk to a renderer. The plugin will respond with 319 // Creates a channel to talk to a renderer. The plugin will respond with
312 // PpapiHostMsg_ChannelCreated. 320 // PpapiHostMsg_ChannelCreated.
313 IPC_MESSAGE_CONTROL3(PpapiMsg_CreateChannel, 321 IPC_MESSAGE_CONTROL3(PpapiMsg_CreateChannel,
314 base::ProcessId /* renderer_pid */, 322 base::ProcessId /* renderer_pid */,
315 int /* renderer_child_id */, 323 int /* renderer_child_id */,
316 bool /* incognito */) 324 bool /* incognito */)
317 325
318 // Creates a channel to talk to a renderer. This message is only used by the 326 // Creates a channel to talk to a renderer. This message is only used by the
319 // NaCl IPC proxy. It is intercepted by NaClIPCAdapter, which creates the 327 // NaCl IPC proxy. It is intercepted by NaClIPCAdapter, which creates the
320 // actual channel and rewrites the message for the untrusted side. 328 // actual channel and rewrites the message for the untrusted side.
321 IPC_MESSAGE_CONTROL4(PpapiMsg_CreateNaClChannel, 329 IPC_MESSAGE_CONTROL3(PpapiMsg_CreateNaClChannel,
322 int /* renderer_id */, 330 int /* renderer_id */,
323 ppapi::PpapiPermissions /* permissions */, 331 ppapi::PpapiNaClChannelArgs /* args */,
324 bool /* incognito */,
325 ppapi::proxy::SerializedHandle /* channel_handle */) 332 ppapi::proxy::SerializedHandle /* channel_handle */)
326 333
327 // Instructs the plugin process to crash. 334 // Instructs the plugin process to crash.
328 IPC_MESSAGE_CONTROL0(PpapiMsg_Crash) 335 IPC_MESSAGE_CONTROL0(PpapiMsg_Crash)
329 336
330 // Instructs the plugin process to hang. 337 // Instructs the plugin process to hang.
331 IPC_MESSAGE_CONTROL0(PpapiMsg_Hang) 338 IPC_MESSAGE_CONTROL0(PpapiMsg_Hang)
332 339
333 // Each plugin may be referenced by multiple renderers. We need the instance 340 // Each plugin may be referenced by multiple renderers. We need the instance
334 // IDs to be unique within a plugin, despite coming from different renderers, 341 // IDs to be unique within a plugin, despite coming from different renderers,
(...skipping 1492 matching lines...) Expand 10 before | Expand all | Expand 10 after
1827 std::vector<ppapi::HostResource> /* buffers */, 1834 std::vector<ppapi::HostResource> /* buffers */,
1828 uint32_t /* buffer_size */) 1835 uint32_t /* buffer_size */)
1829 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus, 1836 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus,
1830 uint32_t /* status */) 1837 uint32_t /* status */)
1831 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError, 1838 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError,
1832 uint32_t /* error */) 1839 uint32_t /* error */)
1833 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady, 1840 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady,
1834 uint32_t /* buffer */) 1841 uint32_t /* buffer */)
1835 1842
1836 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 1843 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
OLDNEW
« no previous file with comments | « ppapi/proxy/plugin_main_nacl.cc ('k') | ppapi/shared_impl/ppapi_nacl_channel_args.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698