Out of process Pepper

chrome/common/pepper_plugin_registry.cc

 // Copyright (c) 2010 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 "chrome/common/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "remoting/client/plugin/pepper_entrypoints.h"
 
 const char* PepperPluginRegistry::kPDFPluginName = "Chrome PDF Viewer";
 const char* PepperPluginRegistry::kPDFPluginMimeType = "application/pdf";
 const char* PepperPluginRegistry::kPDFPluginExtension = "pdf";
 const char* PepperPluginRegistry::kPDFPluginDescription =
     "Portable Document Format";
 
-PepperPluginInfo::PepperPluginInfo() : is_internal(false) {
+PepperPluginInfo::PepperPluginInfo()
+    : is_internal(false),
+      is_out_of_process(false) {
 }
 
 PepperPluginInfo::~PepperPluginInfo() {}
 
 // static
 PepperPluginRegistry* PepperPluginRegistry::GetInstance() {
   static PepperPluginRegistry registry;
   return &registry;
 }
 
@@ skipping 10 matching lines @@
 
   GetPluginInfoFromSwitch(plugins);
   GetExtraPlugins(plugins);
 }
 
 // static
 void PepperPluginRegistry::PreloadModules() {
   std::vector<PepperPluginInfo> plugins;
   GetList(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
-    if (!plugins[i].is_internal) {
+    if (!plugins[i].is_internal && !plugins[i].is_out_of_process) {
       base::NativeLibrary library = base::LoadNativeLibrary(plugins[i].path);
       LOG_IF(WARNING, !library) << "Unable to load plugin "
                                 << plugins[i].path.value();
     }
   }
 }
 
 // static
 void PepperPluginRegistry::GetPluginInfoFromSwitch(
     std::vector<PepperPluginInfo>* plugins) {
   const std::string value =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kRegisterPepperPlugins);
   if (value.empty())
     return;
 
+  bool out_of_process =
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiOutOfProcess);
+
   // FORMAT:
   // command-line = <plugin-entry> + *( LWS + "," + LWS + <plugin-entry> )
   // plugin-entry = <file-path> + ["#" + <name> + ["#" + <description>]] +
   //                *1( LWS + ";" + LWS + <mime-type> )
 
   std::vector<std::string> modules;
   base::SplitString(value, ',', &modules);
   for (size_t i = 0; i < modules.size(); ++i) {
     std::vector<std::string> parts;
     base::SplitString(modules[i], ';', &parts);
     if (parts.size() < 2) {
       DLOG(ERROR) << "Required mime-type not found";
       continue;
     }
 
     std::vector<std::string> name_parts;
     base::SplitString(parts[0], '#', &name_parts);
 
     PepperPluginInfo plugin;
+    plugin.is_out_of_process = out_of_process;
 #if defined(OS_WIN)
     // This means we can't provide plugins from non-ASCII paths, but
     // since this switch is only for development I don't think that's
     // too awful.
     plugin.path = FilePath(ASCIIToUTF16(name_parts[0]));
 #else
     plugin.path = FilePath(name_parts[0]);
 #endif
     if (name_parts.size() > 1)
       plugin.name = name_parts[1];
@@ skipping 60 matching lines @@
     info.mime_types.push_back("pepper-application/x-chromoting");
     info.entry_points.get_interface = remoting::PPP_GetInterface;
     info.entry_points.initialize_module = remoting::PPP_InitializeModule;
     info.entry_points.shutdown_module = remoting::PPP_ShutdownModule;
 
     plugin_info->push_back(info);
   }
 #endif
 }
 
+bool PepperPluginRegistry::RunOutOfProcessForPlugin(
+    const FilePath& path) const {
+  // TODO(brettw) don't recompute this every time. But since this Pepper
+  // switch is only for development, it's OK for now.
+  std::vector<PepperPluginInfo> plugins;
+  GetList(&plugins);
+  for (size_t i = 0; i < plugins.size(); ++i) {
+    if (path == plugins[i].path)
+      return plugins[i].is_out_of_process;
+  }
+  return false;
+}
+
 pepper::PluginModule* PepperPluginRegistry::GetModule(
     const FilePath& path) const {
   ModuleMap::const_iterator it = modules_.find(path);
   if (it == modules_.end())
     return NULL;
   return it->second;
 }
 
 PepperPluginRegistry::~PepperPluginRegistry() {}
 
 PepperPluginRegistry::PepperPluginRegistry() {
   InternalPluginInfoList internal_plugin_info;
   GetInternalPluginInfo(&internal_plugin_info);
+
   // Register modules for these suckers.
   for (InternalPluginInfoList::const_iterator it =
          internal_plugin_info.begin();
        it != internal_plugin_info.end();
        ++it) {
     const FilePath& path = it->path;
     ModuleHandle module =
         pepper::PluginModule::CreateInternalModule(it->entry_points);
     if (!module) {
       DLOG(ERROR) << "Failed to load pepper module: " << path.value();
       continue;
     }
     module->set_name(it->name);
     modules_[path] = module;
   }
 
   // Add the modules specified on the command line last so that they can
   // override the internal plugins.
   std::vector<PepperPluginInfo> plugins;
   GetPluginInfoFromSwitch(&plugins);
   GetExtraPlugins(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
+    if (plugins[i].is_out_of_process)
+      continue;  // Only preload in-process plugins.
+
     const FilePath& path = plugins[i].path;
     ModuleHandle module = pepper::PluginModule::CreateModule(path);
     if (!module) {
       DLOG(ERROR) << "Failed to load pepper module: " << path.value();
       continue;
     }
     module->set_name(plugins[i].name);
     modules_[path] = module;
   }
 }