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

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

Issue 11722017: Use an explicit PID for duplicating Pepper handles rather than the Channel's. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/plugin_main_nacl.cc ('k') | ppapi/proxy/ppapi_proxy_test.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/file_path.h" 10 #include "base/file_path.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 292 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
293 293
294 // These are from the browser to the plugin. 294 // These are from the browser to the plugin.
295 // Loads the given plugin. 295 // Loads the given plugin.
296 IPC_MESSAGE_CONTROL2(PpapiMsg_LoadPlugin, 296 IPC_MESSAGE_CONTROL2(PpapiMsg_LoadPlugin,
297 FilePath /* path */, 297 FilePath /* path */,
298 ppapi::PpapiPermissions /* permissions */) 298 ppapi::PpapiPermissions /* permissions */)
299 299
300 // Creates a channel to talk to a renderer. The plugin will respond with 300 // Creates a channel to talk to a renderer. The plugin will respond with
301 // PpapiHostMsg_ChannelCreated. 301 // PpapiHostMsg_ChannelCreated.
302 IPC_MESSAGE_CONTROL2(PpapiMsg_CreateChannel, 302 IPC_MESSAGE_CONTROL3(PpapiMsg_CreateChannel,
303 int /* renderer_id */, 303 base::ProcessId /* renderer_pid */,
304 int /* renderer_child_id */,
304 bool /* incognito */) 305 bool /* incognito */)
305 306
306 // Creates a channel to talk to a renderer. This message is only used by the 307 // Creates a channel to talk to a renderer. This message is only used by the
307 // NaCl IPC proxy. It is intercepted by NaClIPCAdapter, which creates the 308 // NaCl IPC proxy. It is intercepted by NaClIPCAdapter, which creates the
308 // actual channel and rewrites the message for the untrusted side. 309 // actual channel and rewrites the message for the untrusted side.
309 IPC_MESSAGE_CONTROL4(PpapiMsg_CreateNaClChannel, 310 IPC_MESSAGE_CONTROL4(PpapiMsg_CreateNaClChannel,
310 int /* renderer_id */, 311 int /* renderer_id */,
311 ppapi::PpapiPermissions /* permissions */, 312 ppapi::PpapiPermissions /* permissions */,
312 bool /* incognito */, 313 bool /* incognito */,
313 ppapi::proxy::SerializedHandle /* channel_handle */) 314 ppapi::proxy::SerializedHandle /* channel_handle */)
(...skipping 1423 matching lines...) Expand 10 before | Expand all | Expand 10 after
1737 std::vector<ppapi::HostResource> /* buffers */, 1738 std::vector<ppapi::HostResource> /* buffers */,
1738 uint32_t /* buffer_size */) 1739 uint32_t /* buffer_size */)
1739 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus, 1740 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus,
1740 uint32_t /* status */) 1741 uint32_t /* status */)
1741 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError, 1742 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError,
1742 uint32_t /* error */) 1743 uint32_t /* error */)
1743 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady, 1744 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady,
1744 uint32_t /* buffer */) 1745 uint32_t /* buffer */)
1745 1746
1746 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 1747 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
OLDNEW
« no previous file with comments | « ppapi/proxy/plugin_main_nacl.cc ('k') | ppapi/proxy/ppapi_proxy_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698