Create IPC channel to communicate with the renderer in NaClListener::OnStart().

ppapi/proxy/plugin_main_nacl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <set>
 
 #include "build/build_config.h"
 // Need to include this before most other files because it defines
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
@@ skipping 27 matching lines @@
 
 LogFunctionMap g_log_function_mapping;
 
 #define IPC_MESSAGE_MACROS_LOG_ENABLED
 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \
   g_log_function_mapping[msg_id] = logger
 
 #endif
 #include "ppapi/proxy/ppapi_messages.h"
 
-// This must match up with NACL_CHROME_INITIAL_IPC_DESC,
-// defined in sel_main_chrome.h
-#define NACL_IPC_FD 6
+// The FD # to communicate with the browser. This must match up with
+// the value set in nacl_listener.cc.
+#define NACL_IPC_BROWSER_FD 6

[Mark Seaborn, 2014/02/04 19:28:12]

Can you use NACL_CHROME_DESC_BASE instead, please?

[hidehiko, 2014/02/05 06:30:16]

Done. Note that we cannot include sel_main_chrome.h directly, as it is under
trusted/.

[Mark Seaborn, 2014/02/05 17:25:14]

If checkdeps complained about using sel_main_chrome.h we could have changed the
DEPS file to make an exception -- that would be better than duplicating the
number here.

However, I've moved sel_main_chrome.h to native_client/src/public/chrome_main.h
(https://src.chromium.org/viewvc/native_client?revision=12705&view=revision), so
you can just #include the latter now.

[hidehiko, 2014/02/06 19:27:30]

Done. Note that, native_client/src/public was not in the include_rules of
ppapi/proxy/DEPS, so I added it.

+
+// The FD # to communicate with the renderer. This must match up with
+// the value set in nacl_listener.cc.
+#define NACL_IPC_RENDERER_FD 7
 
 using ppapi::proxy::PluginDispatcher;
 using ppapi::proxy::PluginGlobals;
 using ppapi::proxy::PluginProxyDelegate;
 using ppapi::proxy::ProxyChannel;
 using ppapi::proxy::SerializedHandle;
 
 namespace {
 
 // This class manages communication between the plugin and the browser, and
@@ skipping 24 matching lines @@
   virtual PP_Resource CreateBrowserFont(
       ppapi::proxy::Connection connection,
       PP_Instance instance,
       const PP_BrowserFont_Trusted_Description& desc,
       const ppapi::Preferences& prefs) OVERRIDE;
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
-  void OnMsgCreateNaClChannel(const ppapi::PpapiNaClChannelArgs& args,
-                              SerializedHandle handle);
+  void OnMsgInitializeNaClDispatcher(
+      const ppapi::PpapiInitializeNaClDispatcherArgs& args);
   void OnPluginDispatcherMessageReceived(const IPC::Message& msg);
 
   void SetPpapiKeepAliveThrottleFromCommandLine();
 
   std::set<PP_Instance> instances_;
   std::map<uint32, PluginDispatcher*> plugin_dispatchers_;
   uint32 next_plugin_dispatcher_id_;
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   base::WaitableEvent shutdown_event_;
 };
 
 PpapiDispatcher::PpapiDispatcher(scoped_refptr<base::MessageLoopProxy> io_loop)
     : next_plugin_dispatcher_id_(0),
       message_loop_(io_loop),
       shutdown_event_(true, false) {
   IPC::ChannelHandle channel_handle(
-      "NaCl IPC", base::FileDescriptor(NACL_IPC_FD, false));
+      "NaCl IPC", base::FileDescriptor(NACL_IPC_BROWSER_FD, false));
   // We don't have/need a PID since handle sharing happens outside of the
   // NaCl sandbox.
   InitWithChannel(this, base::kNullProcessId, channel_handle,
                   false);  // Channel is server.
   channel()->AddFilter(new ppapi::proxy::PluginMessageFilter(
       NULL, PluginGlobals::Get()->resource_reply_thread_registrar()));
   channel()->AddFilter(
       new tracing::ChildTraceMessageFilter(message_loop_.get()));
 }
 
@@ skipping 58 matching lines @@
     ppapi::proxy::Connection connection,
     PP_Instance instance,
     const PP_BrowserFont_Trusted_Description& desc,
     const ppapi::Preferences& prefs) {
   NOTIMPLEMENTED();
   return 0;
 }
 
 bool PpapiDispatcher::OnMessageReceived(const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(PpapiDispatcher, msg)
-    IPC_MESSAGE_HANDLER(PpapiMsg_CreateNaClChannel, OnMsgCreateNaClChannel)
+    IPC_MESSAGE_HANDLER(PpapiMsg_InitializeNaClDispatcher,
+                        OnMsgInitializeNaClDispatcher)
     // All other messages are simply forwarded to a PluginDispatcher.
     IPC_MESSAGE_UNHANDLED(OnPluginDispatcherMessageReceived(msg))
   IPC_END_MESSAGE_MAP()
   return true;
 }
 
-void PpapiDispatcher::OnMsgCreateNaClChannel(
-    const ppapi::PpapiNaClChannelArgs& args,
-    SerializedHandle handle) {
+void PpapiDispatcher::OnMsgInitializeNaClDispatcher(

[Mark Seaborn, 2014/02/04 19:28:12]

Can you add a check that would abort or ignore the message if a second message
is received?

[hidehiko, 2014/02/05 06:30:16]

Done.

+    const ppapi::PpapiInitializeNaClDispatcherArgs& args) {
   static bool command_line_and_logging_initialized = false;
   if (!command_line_and_logging_initialized) {
     CommandLine::Init(0, NULL);
     for (size_t i = 0; i < args.switch_names.size(); ++i) {
       DCHECK(i < args.switch_values.size());
       CommandLine::ForCurrentProcess()->AppendSwitchASCII(
           args.switch_names[i], args.switch_values[i]);
     }
     logging::LoggingSettings settings;
     settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
     logging::InitLogging(settings);
     SetPpapiKeepAliveThrottleFromCommandLine();
     command_line_and_logging_initialized = true;
   }
   // Tell the process-global GetInterface which interfaces it can return to the
   // plugin.
   ppapi::proxy::InterfaceList::SetProcessGlobalPermissions(
       args.permissions);
 
   int32_t error = ::PPP_InitializeModule(
       0 /* module */,
       &ppapi::proxy::PluginDispatcher::GetBrowserInterface);
   if (error)
     ::exit(error);
 
   PluginDispatcher* dispatcher =
       new PluginDispatcher(::PPP_GetInterface, args.permissions,
                            args.off_the_record);
   // The channel handle's true name is not revealed here.
-  IPC::ChannelHandle channel_handle("nacl", handle.descriptor());
+  IPC::ChannelHandle channel_handle(
+      "nacl", base::FileDescriptor(NACL_IPC_RENDERER_FD, false));
   if (!dispatcher->InitPluginWithChannel(this, base::kNullProcessId,
                                          channel_handle, false)) {
     delete dispatcher;
     return;
   }
   // From here, the dispatcher will manage its own lifetime according to the
   // lifetime of the attached channel.
 }
 
 void PpapiDispatcher::OnPluginDispatcherMessageReceived(
@@ skipping 52 matching lines @@
     return 1;
   }
 
   PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy());
   plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher);
 
   loop.Run();
 
   return 0;
 }