Use an explicit PID for duplicating Pepper handles rather than the Channel's.

content/renderer/pepper/pepper_plugin_delegate_impl.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 "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <cstddef>
 #include <map>
 #include <queue>
@@ skipping 88 matching lines @@
 
 namespace {
 
 // This class wraps a dispatcher and has the same lifetime. A dispatcher has
 // the same lifetime as a plugin module, which is longer than any particular
 // RenderView or plugin instance.
 class HostDispatcherWrapper
     : public webkit::ppapi::PluginDelegate::OutOfProcessProxy {
  public:
   HostDispatcherWrapper(webkit::ppapi::PluginModule* module,
+                        base::ProcessId peer_pid,
                         int plugin_child_id,
                         const ppapi::PpapiPermissions& perms,
                         bool is_external)
       : module_(module),
+        peer_pid_(peer_pid),
         plugin_child_id_(plugin_child_id),
         permissions_(perms),
         is_external_(is_external) {
   }
   virtual ~HostDispatcherWrapper() {}
 
   bool Init(const IPC::ChannelHandle& channel_handle,
             PP_GetInterface_Func local_get_interface,
             const ppapi::Preferences& preferences,
             PepperHungPluginFilter* filter) {
     if (channel_handle.name.empty())
       return false;
 
 #if defined(OS_POSIX)
     DCHECK_NE(-1, channel_handle.socket.fd);
     if (channel_handle.socket.fd == -1)
       return false;
 #endif
 
     dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl);
     dispatcher_.reset(new ppapi::proxy::HostDispatcher(
         module_->pp_module(), local_get_interface, filter, permissions_));
 
     if (!dispatcher_->InitHostWithChannel(dispatcher_delegate_.get(),
+                                          peer_pid_,
                                           channel_handle,
                                           true,  // Client.
                                           preferences)) {
       dispatcher_.reset();
       dispatcher_delegate_.reset();
       return false;
     }
     dispatcher_->channel()->SetRestrictDispatchChannelGroup(
         kRendererRestrictDispatchGroup_Pepper);
     return true;
@@ skipping 40 matching lines @@
           instance,
           is_external_));
     }
   }
 
   ppapi::proxy::HostDispatcher* dispatcher() { return dispatcher_.get(); }
 
  private:
   webkit::ppapi::PluginModule* module_;
 
+  base::ProcessId peer_pid_;
+
   // ID that the browser process uses to idetify the child process for the
   // plugin. This isn't directly useful from our process (the renderer) except
   // in messages to the browser to disambiguate plugins.
   int plugin_child_id_;
 
   ppapi::PpapiPermissions permissions_;
   bool is_external_;
 
   scoped_ptr<ppapi::proxy::HostDispatcher> dispatcher_;
   scoped_ptr<ppapi::proxy::ProxyChannel::Delegate> dispatcher_delegate_;
@@ skipping 183 matching lines @@
   } else if (!info->is_out_of_process) {
     // In-process plugin not preloaded, it probably couldn't be initialized.
     return scoped_refptr<webkit::ppapi::PluginModule>();
   }
 
   ppapi::PpapiPermissions permissions =
       ppapi::PpapiPermissions::GetForCommandLine(info->permissions);
 
   // Out of process: have the browser start the plugin process for us.
   IPC::ChannelHandle channel_handle;
+  base::ProcessId peer_pid;
   int plugin_child_id = 0;
   render_view_->Send(new ViewHostMsg_OpenChannelToPepperPlugin(
-      path, &channel_handle, &plugin_child_id));
+      path, &channel_handle, &peer_pid, &plugin_child_id));
   if (channel_handle.name.empty()) {
     // Couldn't be initialized.
     return scoped_refptr<webkit::ppapi::PluginModule>();
   }
 
   // AddLiveModule must be called before any early returns since the
   // module's destructor will remove itself.
   module = new webkit::ppapi::PluginModule(
       info->name, path,
       PepperPluginRegistry::GetInstance(),
       permissions);
   PepperPluginRegistry::GetInstance()->AddLiveModule(path, module);
 
   if (!CreateOutOfProcessModule(module,
                                 path,
                                 permissions,
                                 channel_handle,
+                                peer_pid,
                                 plugin_child_id,
                                 false))  // is_external = false
     return scoped_refptr<webkit::ppapi::PluginModule>();
 
   return module;
 }
 
 RendererPpapiHost* PepperPluginDelegateImpl::CreateExternalPluginModule(
     scoped_refptr<webkit::ppapi::PluginModule> module,
     const FilePath& path,
     ppapi::PpapiPermissions permissions,
     const IPC::ChannelHandle& channel_handle,
+    base::ProcessId peer_pid,
     int plugin_child_id) {
   // We don't call PepperPluginRegistry::AddLiveModule, as this module is
   // managed externally.
   return CreateOutOfProcessModule(module,
                                   path,
                                   permissions,
                                   channel_handle,
+                                  peer_pid,
                                   plugin_child_id,
                                   true);  // is_external = true
 }
 
 scoped_refptr<PepperBrokerImpl> PepperPluginDelegateImpl::CreateBroker(
     webkit::ppapi::PluginModule* plugin_module) {
   DCHECK(plugin_module);
   DCHECK(!plugin_module->GetBroker());
 
   // The broker path is the same as the plugin.
@@ skipping 16 matching lines @@
   }
 
   return broker;
 }
 
 RendererPpapiHost* PepperPluginDelegateImpl::CreateOutOfProcessModule(
     webkit::ppapi::PluginModule* module,
     const FilePath& path,
     ppapi::PpapiPermissions permissions,
     const IPC::ChannelHandle& channel_handle,
+    base::ProcessId peer_pid,
     int plugin_child_id,
     bool is_external) {
   scoped_refptr<PepperHungPluginFilter> hung_filter(
       new PepperHungPluginFilter(path,
                                  render_view_->routing_id(),
                                  plugin_child_id));
   scoped_ptr<HostDispatcherWrapper> dispatcher(
       new HostDispatcherWrapper(module,
+                                peer_pid,
                                 plugin_child_id,
                                 permissions,
                                 is_external));
   if (!dispatcher->Init(
           channel_handle,
           webkit::ppapi::PluginModule::GetLocalGetInterfaceFunc(),
           GetPreferences(),
           hung_filter.get()))
     return NULL;
 
   RendererPpapiHostImpl* host_impl =
       RendererPpapiHostImpl::CreateOnModuleForOutOfProcess(
           module, dispatcher->dispatcher(), permissions);
   render_view_->PpapiPluginCreated(host_impl);
 
   module->InitAsProxied(dispatcher.release());
   return host_impl;
 }
 
 void PepperPluginDelegateImpl::OnPpapiBrokerChannelCreated(
     int request_id,
+    base::ProcessId broker_pid,
     const IPC::ChannelHandle& handle) {
   scoped_refptr<PepperBrokerImpl>* broker_ptr =
       pending_connect_broker_.Lookup(request_id);
   if (broker_ptr) {
     scoped_refptr<PepperBrokerImpl> broker = *broker_ptr;
     pending_connect_broker_.Remove(request_id);
-    broker->OnBrokerChannelConnected(handle);
+    broker->OnBrokerChannelConnected(broker_pid, handle);
   } else {
     // There is no broker waiting for this channel. Close it so the broker can
     // clean up and possibly exit.
     // The easiest way to clean it up is to just put it in an object
     // and then close them. This failure case is not performance critical.
     PepperBrokerDispatcherWrapper temp_dispatcher;
-    temp_dispatcher.Init(handle);
+    temp_dispatcher.Init(broker_pid, handle);
   }
 }
 
 // Iterates through pending_connect_broker_ to find the broker.
 // Cannot use Lookup() directly because pending_connect_broker_ does not store
 // the raw pointer to the broker. Assumes maximum of one copy of broker exists.
 bool PepperPluginDelegateImpl::StopWaitingForBrokerConnection(
     PepperBrokerImpl* broker) {
   for (BrokerMap::iterator i(&pending_connect_broker_);
        !i.IsAtEnd(); i.Advance()) {
@@ skipping 1189 matching lines @@
     RenderWidgetFullscreenPepper* container =
         static_cast<RenderWidgetFullscreenPepper*>(
             instance->fullscreen_container());
     return container->mouse_lock_dispatcher();
   } else {
     return render_view_->mouse_lock_dispatcher();
   }
 }
 
 }  // namespace content