Share PPAPI out-of-process plugins between renderer processes....

chrome/browser/ppapi_plugin_process_host.cc

Index: chrome/browser/ppapi_plugin_process_host.cc
===================================================================
--- chrome/browser/ppapi_plugin_process_host.cc	(revision 74733)
+++ chrome/browser/ppapi_plugin_process_host.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,40 +7,36 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/process_util.h"
+#include "chrome/browser/plugin_service.h"
 #include "chrome/browser/renderer_host/render_message_filter.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "ipc/ipc_switches.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
-PpapiPluginProcessHost::PpapiPluginProcessHost(RenderMessageFilter* filter)
-    : BrowserChildProcessHost(ChildProcessInfo::PPAPI_PLUGIN_PROCESS,
-                              filter->resource_dispatcher_host()),
-      filter_(filter) {
+PpapiPluginProcessHost::PpapiPluginProcessHost()
+    : BrowserChildProcessHost(
+          ChildProcessInfo::PPAPI_PLUGIN_PROCESS,
+          PluginService::GetInstance()->resource_dispatcher_host()) {
 }
 
 PpapiPluginProcessHost::~PpapiPluginProcessHost() {
+  CancelRequests();
 }
 
-void PpapiPluginProcessHost::Init(const FilePath& path,
-                                  IPC::Message* reply_msg) {
+bool PpapiPluginProcessHost::Init(const FilePath& path) {
   plugin_path_ = path;
-  reply_msg_.reset(reply_msg);
 
-  if (!CreateChannel()) {
-    ReplyToRenderer(base::kNullProcessHandle, IPC::ChannelHandle());
-    return;
-  }
+  if (!CreateChannel())
+    return false;
 
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   CommandLine::StringType plugin_launcher =
       browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
 
   FilePath exe_path = ChildProcessHost::GetChildPath(plugin_launcher.empty());
-  if (exe_path.empty()) {
-    ReplyToRenderer(base::kNullProcessHandle, IPC::ChannelHandle());
-    return;
-  }
+  if (exe_path.empty())
+    return false;
 
   CommandLine* cmd_line = new CommandLine(exe_path);
   cmd_line->AppendSwitchASCII(switches::kProcessType,
@@ -60,8 +56,38 @@
       base::environment_vector(),
 #endif
       cmd_line);
+  return true;
 }
 
+void PpapiPluginProcessHost::OpenChannelToPlugin(Client* client) {
+  if (opening_channel()) {
+    // The channel is already in the process of being opened.  Put
+    // this "open channel" request into a queue of requests that will
+    // be run once the channel is open.
+    pending_requests_.push_back(client);
+    return;
+  }
+
+  // We already have an open channel, send a request right away to plugin.
+  RequestPluginChannel(client);
+}
+
+void PpapiPluginProcessHost::RequestPluginChannel(Client* client) {
+  base::ProcessHandle process_handle;
+  int renderer_id;
+  client->GetChannelInfo(&process_handle, &renderer_id);
+
+  // We can't send any sync messages from the browser because it might lead to
+  // a hang. See the similar code in PluginProcessHost for more description.
+  PpapiMsg_CreateChannel* msg = new PpapiMsg_CreateChannel(process_handle,
+                                                           renderer_id);
+  msg->set_unblock(true);
+  if (Send(msg))
+    sent_requests_.push(client);
+  else
+    client->OnChannelOpened(base::kNullProcessHandle, IPC::ChannelHandle());
+}
+
 bool PpapiPluginProcessHost::CanShutdown() {
   return true;
 }
@@ -72,56 +98,77 @@
 bool PpapiPluginProcessHost::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PpapiPluginProcessHost, msg)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PluginLoaded, OnPluginLoaded)
+    IPC_MESSAGE_HANDLER(PpapiHostMsg_ChannelCreated,
+                        OnRendererPluginChannelCreated)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   return handled;
 }
 
+// Called when the browser <--> plugin channel has been established.
 void PpapiPluginProcessHost::OnChannelConnected(int32 peer_pid) {
-#if defined(OS_WIN)
-  base::ProcessHandle plugins_renderer_handle = NULL;
-  ::DuplicateHandle(::GetCurrentProcess(), filter_->peer_handle(),
-                    GetChildProcessHandle(), &plugins_renderer_handle,
-                    0, FALSE, DUPLICATE_SAME_ACCESS);
-#elif defined(OS_POSIX)
-  base::ProcessHandle plugins_renderer_handle = filter_->peer_handle();
-#endif
+  // This will actually load the plugin. Errors will actually not be reported
+  // back at this point. Instead, the plugin will fail to establish the
+  // connections when we request them on behalf of the renderer(s).
+  Send(new PpapiMsg_LoadPlugin(plugin_path_));
 
-  PpapiMsg_LoadPlugin* msg = new PpapiMsg_LoadPlugin(
-      plugins_renderer_handle, plugin_path_, filter_->render_process_id());
-  if (!Send(msg))  // Just send an empty handle on failure.
-    ReplyToRenderer(base::kNullProcessHandle, IPC::ChannelHandle());
-  // This function will result in OnChannelCreated getting called to finish.
+  // Process all pending channel requests from the renderers.
+  for (size_t i = 0; i < pending_requests_.size(); i++)
+    RequestPluginChannel(pending_requests_[i]);
+  pending_requests_.clear();
 }
 
+// Called when the browser <--> plugin channel has an error. This normally
+// means the plugin has crashed.
 void PpapiPluginProcessHost::OnChannelError() {
-  if (reply_msg_.get())
-    ReplyToRenderer(base::kNullProcessHandle, IPC::ChannelHandle());
+  // We don't need to notify the renderers that were communicating with the
+  // plugin since they have their own channels which will go into the error
+  // state at the same time. Instead, we just need to notify any renderers
+  // that have requested a connection but have not yet received one.
+  CancelRequests();
 }
 
-void PpapiPluginProcessHost::OnPluginLoaded(
+void PpapiPluginProcessHost::CancelRequests() {
+  for (size_t i = 0; i < pending_requests_.size(); i++) {
+    pending_requests_[i]->OnChannelOpened(base::kNullProcessHandle,
+                                          IPC::ChannelHandle());
+  }
+  pending_requests_.clear();
+
+  while (!sent_requests_.empty()) {
+    sent_requests_.front()->OnChannelOpened(base::kNullProcessHandle,
+                                            IPC::ChannelHandle());
+    sent_requests_.pop();
+  }
+}
+
+// Called when a new plugin <--> renderer channel has been created.
+void PpapiPluginProcessHost::OnRendererPluginChannelCreated(
     const IPC::ChannelHandle& channel_handle) {
+  if (sent_requests_.empty())
+    return;
+
+  // All requests should be processed FIFO, so the next item in the
+  // sent_requests_ queue should be the one that the plugin just created.
+  Client* client = sent_requests_.front();
+  sent_requests_.pop();
+
+  // Prepare the handle to send to the renderer.
   base::ProcessHandle plugin_process = GetChildProcessHandle();
 #if defined(OS_WIN)
+  base::ProcessHandle renderer_process;
+  int renderer_id;
+  client->GetChannelInfo(&renderer_process, &renderer_id);
+
   base::ProcessHandle renderers_plugin_handle = NULL;
   ::DuplicateHandle(::GetCurrentProcess(), plugin_process,
-                    filter_->peer_handle(), &renderers_plugin_handle,
+                    renderer_process, &renderers_plugin_handle,
                     0, FALSE, DUPLICATE_SAME_ACCESS);
 #elif defined(OS_POSIX)
   // Don't need to duplicate anything on POSIX since it's just a PID.
   base::ProcessHandle renderers_plugin_handle = plugin_process;
 #endif
-  ReplyToRenderer(renderers_plugin_handle, channel_handle);
-}
 
-void PpapiPluginProcessHost::ReplyToRenderer(
-    base::ProcessHandle plugin_handle,
-    const IPC::ChannelHandle& channel_handle) {
-  DCHECK(reply_msg_.get());
-  ViewHostMsg_OpenChannelToPepperPlugin::WriteReplyParams(reply_msg_.get(),
-                                                          plugin_handle,
-                                                          channel_handle);
-  filter_->Send(reply_msg_.release());
+  client->OnChannelOpened(renderers_plugin_handle, channel_handle);
 }