diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 10:20:49 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 10:20:49 +0000 |
| commit | c47ec40ba81351041096fc6cfb00c98bd74b7c06 (patch) | |
| tree | 5fe3445e973fac493d888df2e30d27cdc79225fe /chrome/common/nacl_messages_internal.h | |
| parent | a4a849608e4b1b06dc27b986c98b5e2c57f3367c (diff) | |
| download | chromium_src-c47ec40ba81351041096fc6cfb00c98bd74b7c06.zip chromium_src-c47ec40ba81351041096fc6cfb00c98bd74b7c06.tar.gz chromium_src-c47ec40ba81351041096fc6cfb00c98bd74b7c06.tar.bz2 | |
NaCl: Allow setting up multiple sockets for subprocess instead of just one
Remove the "channel number" parameter from messages, since this is now
fixed in the NaCl plugin code in sel_main_chrome.c.
Replace pair_ and descriptor_ with sockets_for_renderer_ and
sockets_for_sel_ldr_.
NaClProcessMsg_Start: Pass an array of FDs instead of one FD.
ViewHostMsg_LaunchNaCl:
* Add socket count.
* Return an array of FDs instead of one FD.
Expose this functionality to the NaCl plugin via a new function,
"launch_nacl_process_multi_fd".
BUG=50626
TEST=nacl_ui_tests
Review URL: http://codereview.chromium.org/2832093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/nacl_messages_internal.h')
| -rw-r--r-- | chrome/common/nacl_messages_internal.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/common/nacl_messages_internal.h b/chrome/common/nacl_messages_internal.h index abde832..8d95cc7 100644 --- a/chrome/common/nacl_messages_internal.h +++ b/chrome/common/nacl_messages_internal.h @@ -10,9 +10,8 @@ // These are messages sent from the browser to the NaCl process. IPC_BEGIN_MESSAGES(NaClProcess) // Tells the NaCl process to start. - IPC_MESSAGE_CONTROL2(NaClProcessMsg_Start, - int /* descriptor id */, - nacl::FileDescriptor /* handle value */) + IPC_MESSAGE_CONTROL1(NaClProcessMsg_Start, + std::vector<nacl::FileDescriptor> /* sockets */) // Tells the NaCl broker to launch a NaCl loader process. IPC_MESSAGE_CONTROL1(NaClProcessMsg_LaunchLoaderThroughBroker, |