Add support for external out-of-process PPAPI plugins in the browser.

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 90 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,
                         int plugin_child_id,
-                        const ppapi::PpapiPermissions& perms)
+                        const ppapi::PpapiPermissions& perms,
+                        bool is_external)
       : module_(module),
         plugin_child_id_(plugin_child_id),
-        permissions_(perms) {
+        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,
-            const ppapi::PpapiPermissions& permissions,
             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
 
@@ skipping 25 matching lines @@
         RendererPpapiHostImpl::GetForPPInstance(instance);
     // TODO(brettw) remove this null check when the old-style pepper-based
     // browser tag is removed from this file. Getting this notification should
     // always give us an instance we can find in the map otherwise, but that
     // isn't true for browser tag support.
     if (host) {
       RenderView* render_view = host->GetRenderViewForInstance(instance);
       render_view->Send(new ViewHostMsg_DidCreateOutOfProcessPepperInstance(
           plugin_child_id_,
           instance,
-          render_view->GetRoutingID()));
+          render_view->GetRoutingID(),
+          is_external_));
     }
   }
   virtual void RemoveInstance(PP_Instance instance) {
     ppapi::proxy::HostDispatcher::RemoveForInstance(instance);
 
     RendererPpapiHostImpl* host =
         RendererPpapiHostImpl::GetForPPInstance(instance);
     // TODO(brettw) remove null check as described in AddInstance.
     if (host) {
       RenderView* render_view = host->GetRenderViewForInstance(instance);
       render_view->Send(new ViewHostMsg_DidDeleteOutOfProcessPepperInstance(
           plugin_child_id_,
-          instance));
+          instance,
+          is_external_));
     }
   }
 
   ppapi::proxy::HostDispatcher* dispatcher() { return dispatcher_.get(); }
 
  private:
   webkit::ppapi::PluginModule* module_;
 
   // 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_;
 };
 
 class QuotaCallbackTranslator : public QuotaDispatcher::Callback {
  public:
   typedef webkit::ppapi::PluginDelegate::AvailableSpaceCallback PluginCallback;
   explicit QuotaCallbackTranslator(const PluginCallback& cb) : callback_(cb) {}
   virtual void DidQueryStorageUsageAndQuota(int64 usage, int64 quota) OVERRIDE {
@@ skipping 181 matching lines @@
   }
 
   // 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, plugin_child_id)) {
+  if (!CreateOutOfProcessModule(module,
+                                path,
+                                permissions,
+                                channel_handle,
+                                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,
     int plugin_child_id) {
   // We don't call PepperPluginRegistry::AddLiveModule, as this module is
   // managed externally.
-  // TODO(bbudge) pass plugin_child_id when PpapiPluginProcessHost receives
-  // a message notifying it that the external plugin process has been created.
-  return CreateOutOfProcessModule(
-    module, path, permissions, channel_handle, 0);
+  return CreateOutOfProcessModule(module,
+                                  path,
+                                  permissions,
+                                  channel_handle,
+                                  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.
   const FilePath& broker_path = plugin_module->path();
 
@@ skipping 14 matching lines @@
   }
 
   return broker;
 }
 
 RendererPpapiHost* PepperPluginDelegateImpl::CreateOutOfProcessModule(
     webkit::ppapi::PluginModule* module,
     const FilePath& path,
     ppapi::PpapiPermissions permissions,
     const IPC::ChannelHandle& channel_handle,
-    int plugin_child_id) {
+    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, plugin_child_id, permissions));
+      new HostDispatcherWrapper(module,
+                                plugin_child_id,
+                                permissions,
+                                is_external));
   if (!dispatcher->Init(
           channel_handle,
           webkit::ppapi::PluginModule::GetLocalGetInterfaceFunc(),
           GetPreferences(),
-          permissions,

[bbudge, 2012/10/31 23:05:14]

Removed unused parameter. It's passed in the ctor.

           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;
@@ skipping 1392 matching lines @@
     return render_view_->mouse_lock_dispatcher();
   }
 }
 
 webkit_glue::ClipboardClient*
     PepperPluginDelegateImpl::CreateClipboardClient() const {
   return new RendererClipboardClient;
 }
 
 }  // namespace content