Wire experimental Flapper part two

content/common/pepper_plugin_registry.cc

 // 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.
 
 #include "content/common/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/native_library.h"
 #include "base/string_split.h"
@@ skipping 60 matching lines @@
 
     plugins->push_back(plugin);
   }
 }
 
 }  // namespace
 
 webkit::WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const {
   webkit::WebPluginInfo info;
 
-  info.name = name.empty() ? path.BaseName().LossyDisplayName() :
-      ASCIIToUTF16(name);
+  info.type = is_out_of_process ?
+      webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS :
+      webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS;
+
+  info.name = name.empty() ?
+      path.BaseName().LossyDisplayName() : ASCIIToUTF16(name);

[brettw, 2011/08/16 23:28:05]

Can you use UTF8ToUTF16 instead? This will assert if the name isn't ascii, which
probably isn't what we want.

   info.path = path;
   info.version = ASCIIToUTF16(version);
   info.desc = ASCIIToUTF16(description);
   info.mime_types = mime_types;
 
   webkit::WebPluginInfo::EnabledStates enabled_state =
       webkit::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
 
   if (!enabled) {
     enabled_state =
         webkit::WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
   }
 
   info.enabled = enabled_state;
   return info;
 }
 
 PepperPluginInfo::PepperPluginInfo()
     : is_internal(false),
       is_out_of_process(false),
       enabled(true) {
 }
 
 PepperPluginInfo::~PepperPluginInfo() {
 }
 
+bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info,
+                          PepperPluginInfo* pepper_info) {
+
+  if (!webkit::IsPepperPlugin(webplugin_info))

[brettw, 2011/08/16 23:28:05]

No blank line before this

+    return false;
+
+  pepper_info->is_out_of_process =
+      webplugin_info.type ==
+          webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS;
+
+  pepper_info->enabled =  webkit::IsPluginEnabled(webplugin_info);
+  pepper_info->path = FilePath(webplugin_info.path);
+  pepper_info->name = UTF16ToASCII(webplugin_info.name);
+  pepper_info->description = UTF16ToASCII(webplugin_info.desc);
+  pepper_info->version = UTF16ToASCII(webplugin_info.version);
+  pepper_info->mime_types = webplugin_info.mime_types;
+  return true;
+}
+
 // static
 PepperPluginRegistry* PepperPluginRegistry::GetInstance() {
   static PepperPluginRegistry* registry = NULL;
   // This object leaks.  It is a temporary hack to work around a crash.
   // http://code.google.com/p/chromium/issues/detail?id=63234
   if (!registry)
     registry = new PepperPluginRegistry;
   return registry;
 }
 
@@ skipping 13 matching lines @@
       base::NativeLibrary library = base::LoadNativeLibrary(plugins[i].path,
                                                             &error);
       LOG_IF(WARNING, !library) << "Unable to load plugin "
                                 << plugins[i].path.value() << " "
                                 << error;
     }
   }
 }
 
 const PepperPluginInfo* PepperPluginRegistry::GetInfoForPlugin(
-    const FilePath& path) const {
+    const webkit::WebPluginInfo& info) {
   for (size_t i = 0; i < plugin_list_.size(); ++i) {
-    if (path == plugin_list_[i].path)
+    if (info.path == plugin_list_[i].path)
       return &plugin_list_[i];
   }
-  return NULL;
+  // We did not find the plugin in our list. But wait! the plugin can also
+  // be a latecomer, as it happens with windows flapper. This information

[brettw, 2011/08/16 23:28:05]

flapper -> pepper flash.

+  // is actually in |info| and we can use it to construct it and add it to
+  // the list. This same deal needs to be done in the browser side in
+  // PluginService.
+  PepperPluginInfo plugin;
+  if (!MakePepperPluginInfo(info, &plugin))
+    return NULL;
+
+  plugin_list_.push_back(plugin);
+  return &plugin_list_[plugin_list_.size() - 1];
 }
 
 webkit::ppapi::PluginModule* PepperPluginRegistry::GetLiveModule(
     const FilePath& path) {
   NonOwningModuleMap::iterator it = live_modules_.find(path);
   if (it == live_modules_.end())
     return NULL;
   return it->second;
 }
 
@@ skipping 63 matching lines @@
 base::MessageLoopProxy* PepperPluginRegistry::GetIPCMessageLoop() {
   // This is called only in the renderer so we know we have a child process.
   DCHECK(ChildProcess::current()) << "Must be in the renderer.";
   return ChildProcess::current()->io_message_loop_proxy();
 }
 
 base::WaitableEvent* PepperPluginRegistry::GetShutdownEvent() {
   DCHECK(ChildProcess::current()) << "Must be in the renderer.";
   return ChildProcess::current()->GetShutDownEvent();
 }