diff options
| author | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 23:28:10 +0000 |
|---|---|---|
| committer | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 23:28:10 +0000 |
| commit | 73af633e899f3e31157423c888004fdbfb0cd614 (patch) | |
| tree | b8ce7f0c0dbd58d883a35f040ba66ef6ca90d889 /ppapi/proxy/nacl_message_scanner.cc | |
| parent | d00c8764450d87025a31769af9b41ca72a0ed981 (diff) | |
| download | chromium_src-73af633e899f3e31157423c888004fdbfb0cd614.zip chromium_src-73af633e899f3e31157423c888004fdbfb0cd614.tar.gz chromium_src-73af633e899f3e31157423c888004fdbfb0cd614.tar.bz2 | |
Create IPC channel to communicate with the renderer in NaClListener::OnStart().
This is the preparation of the irt_ppapi implementation for non-SFI mode.
Currently (on SFI mode), the IPC channel between the plugin and the renderer
is created in the CreateNaClChannel message handled by NaClIPCAdapter.
However, we won't need nor use NaClIPCAdapter, and it causes the circular
dependency of plugin initialization.
To split the dependency, create the IPC channels for the browser process and
the renderer process at once (in NaClListener::OnStart()).
Note that we cannot remove CreateNaClChannel message, because it is only way
to pass the initialization argument from the browser to plugin. So, it is just
kept with renaming.
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3734
TEST=Ran trybot.
Review URL: https://codereview.chromium.org/150713003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/nacl_message_scanner.cc')
| -rw-r--r-- | ppapi/proxy/nacl_message_scanner.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ppapi/proxy/nacl_message_scanner.cc b/ppapi/proxy/nacl_message_scanner.cc index 44324c3..6fb98f5 100644 --- a/ppapi/proxy/nacl_message_scanner.cc +++ b/ppapi/proxy/nacl_message_scanner.cc @@ -289,11 +289,6 @@ NaClMessageScanner::~NaClMessageScanner() { // message body, rather than passed in a separate FileDescriptorSet. Therefore, // on Windows, any message containing handles must be rewritten in the POSIX // format before we can send it to the NaCl plugin. -// -// On POSIX and Windows we have to rewrite PpapiMsg_CreateNaClChannel messages. -// These contain a handle with an invalid (place holder) descriptor. We need to -// locate this handle so it can be replaced with a valid one when the channel is -// created. bool NaClMessageScanner::ScanMessage( const IPC::Message& msg, std::vector<SerializedHandle>* handles, @@ -307,7 +302,7 @@ bool NaClMessageScanner::ScanMessage( #if defined(OS_WIN) true; #else - (msg.type() == PpapiMsg_CreateNaClChannel::ID); + false; #endif // We can't always tell from the message ID if rewriting is needed. Therefore, @@ -319,7 +314,6 @@ bool NaClMessageScanner::ScanMessage( base::Bind(&NaClMessageScanner::AuditNestedMessage, base::Unretained(this)); switch (msg.type()) { - CASE_FOR_MESSAGE(PpapiMsg_CreateNaClChannel) CASE_FOR_MESSAGE(PpapiMsg_PPBAudio_NotifyAudioStreamCreated) CASE_FOR_MESSAGE(PpapiMsg_PPPMessaging_HandleMessage) CASE_FOR_MESSAGE(PpapiPluginMsg_ResourceReply) |