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

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: Rebased 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "ppapi/proxy/host_resolver_private_resource.h" 48 #include "ppapi/proxy/host_resolver_private_resource.h"
49 #include "ppapi/proxy/ppapi_param_traits.h" 49 #include "ppapi/proxy/ppapi_param_traits.h"
50 #include "ppapi/proxy/ppapi_proxy_export.h" 50 #include "ppapi/proxy/ppapi_proxy_export.h"
51 #include "ppapi/proxy/resource_message_params.h" 51 #include "ppapi/proxy/resource_message_params.h"
52 #include "ppapi/proxy/serialized_flash_menu.h" 52 #include "ppapi/proxy/serialized_flash_menu.h"
53 #include "ppapi/proxy/serialized_handle.h" 53 #include "ppapi/proxy/serialized_handle.h"
54 #include "ppapi/proxy/serialized_structs.h" 54 #include "ppapi/proxy/serialized_structs.h"
55 #include "ppapi/proxy/serialized_var.h" 55 #include "ppapi/proxy/serialized_var.h"
56 #include "ppapi/shared_impl/dir_contents.h" 56 #include "ppapi/shared_impl/dir_contents.h"
57 #include "ppapi/shared_impl/file_path.h" 57 #include "ppapi/shared_impl/file_path.h"
58 #include "ppapi/shared_impl/ppapi_nacl_channel_args.h"
58 #include "ppapi/shared_impl/ppapi_preferences.h" 59 #include "ppapi/shared_impl/ppapi_preferences.h"
59 #include "ppapi/shared_impl/ppb_device_ref_shared.h" 60 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
60 #include "ppapi/shared_impl/ppb_input_event_shared.h" 61 #include "ppapi/shared_impl/ppb_input_event_shared.h"
61 #include "ppapi/shared_impl/ppb_network_list_private_shared.h" 62 #include "ppapi/shared_impl/ppb_network_list_private_shared.h"
62 #include "ppapi/shared_impl/ppb_view_shared.h" 63 #include "ppapi/shared_impl/ppb_view_shared.h"
63 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" 64 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
64 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" 65 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h"
65 #include "ppapi/shared_impl/url_request_info_data.h" 66 #include "ppapi/shared_impl/url_request_info_data.h"
66 #include "ppapi/shared_impl/url_response_info_data.h" 67 #include "ppapi/shared_impl/url_response_info_data.h"
67 68
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 290
290 IPC_STRUCT_TRAITS_BEGIN(ppapi::NetworkInfo) 291 IPC_STRUCT_TRAITS_BEGIN(ppapi::NetworkInfo)
291 IPC_STRUCT_TRAITS_MEMBER(name) 292 IPC_STRUCT_TRAITS_MEMBER(name)
292 IPC_STRUCT_TRAITS_MEMBER(type) 293 IPC_STRUCT_TRAITS_MEMBER(type)
293 IPC_STRUCT_TRAITS_MEMBER(state) 294 IPC_STRUCT_TRAITS_MEMBER(state)
294 IPC_STRUCT_TRAITS_MEMBER(addresses) 295 IPC_STRUCT_TRAITS_MEMBER(addresses)
295 IPC_STRUCT_TRAITS_MEMBER(display_name) 296 IPC_STRUCT_TRAITS_MEMBER(display_name)
296 IPC_STRUCT_TRAITS_MEMBER(mtu) 297 IPC_STRUCT_TRAITS_MEMBER(mtu)
297 IPC_STRUCT_TRAITS_END() 298 IPC_STRUCT_TRAITS_END()
298 299
300 // Only whitelisted switches passed through NaClChannelArgs.
301 // The list of switches can be found in:
302 // chrome/browser/nacl_host/nacl_process_host.cc
303 IPC_STRUCT_TRAITS_BEGIN(ppapi::PpapiNaClChannelArgs)
304 IPC_STRUCT_TRAITS_MEMBER(off_the_record)
305 IPC_STRUCT_TRAITS_MEMBER(permissions)
306 IPC_STRUCT_TRAITS_MEMBER(switch_names)
307 IPC_STRUCT_TRAITS_MEMBER(switch_values)
308 IPC_STRUCT_TRAITS_END()
309
299 #if !defined(OS_NACL) && !defined(NACL_WIN64) 310 #if !defined(OS_NACL) && !defined(NACL_WIN64)
300 311
301 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer) 312 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer)
302 IPC_STRUCT_TRAITS_MEMBER(resource) 313 IPC_STRUCT_TRAITS_MEMBER(resource)
303 IPC_STRUCT_TRAITS_MEMBER(handle) 314 IPC_STRUCT_TRAITS_MEMBER(handle)
304 IPC_STRUCT_TRAITS_MEMBER(size) 315 IPC_STRUCT_TRAITS_MEMBER(size)
305 IPC_STRUCT_TRAITS_END() 316 IPC_STRUCT_TRAITS_END()
306 317
307 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 318 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
308 319
309 // These are from the browser to the plugin. 320 // These are from the browser to the plugin.
310 // Loads the given plugin. 321 // Loads the given plugin.
311 IPC_MESSAGE_CONTROL2(PpapiMsg_LoadPlugin, 322 IPC_MESSAGE_CONTROL2(PpapiMsg_LoadPlugin,
312 base::FilePath /* path */, 323 base::FilePath /* path */,
313 ppapi::PpapiPermissions /* permissions */) 324 ppapi::PpapiPermissions /* permissions */)
314 325
315 // Creates a channel to talk to a renderer. The plugin will respond with 326 // Creates a channel to talk to a renderer. The plugin will respond with
316 // PpapiHostMsg_ChannelCreated. 327 // PpapiHostMsg_ChannelCreated.
317 IPC_MESSAGE_CONTROL3(PpapiMsg_CreateChannel, 328 IPC_MESSAGE_CONTROL3(PpapiMsg_CreateChannel,
318 base::ProcessId /* renderer_pid */, 329 base::ProcessId /* renderer_pid */,
319 int /* renderer_child_id */, 330 int /* renderer_child_id */,
320 bool /* incognito */) 331 bool /* incognito */)
321 332
322 // Creates a channel to talk to a renderer. This message is only used by the 333 // Creates a channel to talk to a renderer. This message is only used by the
323 // NaCl IPC proxy. It is intercepted by NaClIPCAdapter, which creates the 334 // NaCl IPC proxy. It is intercepted by NaClIPCAdapter, which creates the
324 // actual channel and rewrites the message for the untrusted side. 335 // actual channel and rewrites the message for the untrusted side.
325 IPC_MESSAGE_CONTROL4(PpapiMsg_CreateNaClChannel, 336 IPC_MESSAGE_CONTROL3(PpapiMsg_CreateNaClChannel,
326 int /* renderer_id */, 337 int /* renderer_id */,
327 ppapi::PpapiPermissions /* permissions */, 338 ppapi::PpapiNaClChannelArgs /* args */,
328 bool /* incognito */,
329 ppapi::proxy::SerializedHandle /* channel_handle */) 339 ppapi::proxy::SerializedHandle /* channel_handle */)
330 340
331 // Instructs the plugin process to crash. 341 // Instructs the plugin process to crash.
332 IPC_MESSAGE_CONTROL0(PpapiMsg_Crash) 342 IPC_MESSAGE_CONTROL0(PpapiMsg_Crash)
333 343
334 // Instructs the plugin process to hang. 344 // Instructs the plugin process to hang.
335 IPC_MESSAGE_CONTROL0(PpapiMsg_Hang) 345 IPC_MESSAGE_CONTROL0(PpapiMsg_Hang)
336 346
337 // Each plugin may be referenced by multiple renderers. We need the instance 347 // Each plugin may be referenced by multiple renderers. We need the instance
338 // IDs to be unique within a plugin, despite coming from different renderers, 348 // IDs to be unique within a plugin, despite coming from different renderers,
(...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1826 std::vector<ppapi::HostResource> /* buffers */, 1836 std::vector<ppapi::HostResource> /* buffers */,
1827 uint32_t /* buffer_size */) 1837 uint32_t /* buffer_size */)
1828 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus, 1838 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus,
1829 uint32_t /* status */) 1839 uint32_t /* status */)
1830 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError, 1840 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError,
1831 uint32_t /* error */) 1841 uint32_t /* error */)
1832 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady, 1842 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady,
1833 uint32_t /* buffer */) 1843 uint32_t /* buffer */)
1834 1844
1835 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 1845 #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