Ensure we don't load plugins on the IO thread

webkit/glue/plugins/plugin_list_win.cc

 // Copyright (c) 2006-2008 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 <tchar.h>
 
 #include "webkit/glue/plugins/plugin_list.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 21 matching lines @@
 const TCHAR kNewWMPPlugin[] = _T("np-mswmp.dll");
 const TCHAR kOldWMPPlugin[] = _T("npdsplay.dll");
 const TCHAR kYahooApplicationStatePlugin[] = _T("npystate.dll");
 const TCHAR kWanWangProtocolHandlerPlugin[] = _T("npww.dll");
 const TCHAR kRegistryJava[] =
     _T("Software\\JavaSoft\\Java Runtime Environment");
 const TCHAR kRegistryBrowserJavaVersion[] = _T("BrowserJavaVersion");
 const TCHAR kRegistryCurrentJavaVersion[] = _T("CurrentVersion");
 const TCHAR kRegistryJavaHome[] = _T("JavaHome");
 
-#ifdef GEARS_STATIC_LIB
-// defined in gears/base/common/module.cc
-NPError API_CALL Gears_NP_GetEntryPoints(NPPluginFuncs* funcs);
-NPError API_CALL Gears_NP_Initialize(NPNetscapeFuncs* funcs);
-NPError API_CALL Gears_NP_Shutdown(void);
-#endif
-
 // The application path where we expect to find plugins.
 void GetAppDirectory(std::set<FilePath>* plugin_dirs) {
   std::wstring app_path;
   // TODO(avi): use PathService directly
   if (!webkit_glue::GetApplicationDirectory(&app_path))
     return;
 
   app_path.append(L"\\plugins");
   plugin_dirs->insert(FilePath(app_path));
 }
@@ skipping 160 matching lines @@
         L"audio/x-ms-wax|video/x-ms-wmv|video/x-ms-wvx|audio/mpeg|video/mpeg",
     L"*|*|*|*|asf,asx,*|wm,*|wma,*|wax,*|wmv,*|wvx,*|mp2,mp3,mpa,mpeg,mpg|"
         L"mpeg,mpg,m1v,mpe",
     L"",
     {
       activex_shim::ActiveX_Shim_NP_GetEntryPoints,
       activex_shim::ActiveX_Shim_NP_Initialize,
       activex_shim::ActiveX_Shim_NP_Shutdown
     }
   },
-#ifdef GEARS_STATIC_LIB
-  {
-    FilePath(kGearsPluginLibraryName),
-    L"Gears",
-    L"Statically linked Gears",
-    L"1, 0, 0, 1",
-    L"application/x-googlegears",
-    L"",
-    L"",
-    {
-      Gears_NP_GetEntryPoints,
-      Gears_NP_Initialize,
-      Gears_NP_Shutdown
-    }
-  },
-#endif
   };
 
   for (int i = 0; i < arraysize(builtin_plugins); ++i)
     internal_plugins_.push_back(builtin_plugins[i]);
 }
 
 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
   // We use a set for uniqueness, which we require, over order, which we do not.
   std::set<FilePath> dirs;
 
@@ skipping 13 matching lines @@
   // Firefox hard-codes the paths of some popular plugins to ensure that
   // the plugins are found.  We are going to copy this as well.
   GetAcrobatDirectory(&dirs);
   GetQuicktimeDirectory(&dirs);
   GetWindowsMediaDirectory(&dirs);
 
   for (std::set<FilePath>::iterator i = dirs.begin(); i != dirs.end(); ++i)
     plugin_dirs->push_back(*i);
 }
 
-void PluginList::LoadPluginsFromDir(const FilePath &path) {
+void PluginList::LoadPluginsFromDir(const FilePath &path,
+                                    std::vector<WebPluginInfo>* plugins) {
   WIN32_FIND_DATA find_file_data;
   HANDLE find_handle;
 
   std::wstring dir = path.value();
   // FindFirstFile requires that you specify a wildcard for directories.
   dir.append(L"\\NP*.DLL");
 
   find_handle = FindFirstFile(dir.c_str(), &find_file_data);
   if (find_handle == INVALID_HANDLE_VALUE)
     return;
 
   do {
     if (!(find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
       FilePath filename = path.Append(find_file_data.cFileName);
-      LoadPlugin(filename);
+      LoadPlugin(filename, plugins);
     }
   } while (FindNextFile(find_handle, &find_file_data) != 0);
 
   DCHECK(GetLastError() == ERROR_NO_MORE_FILES);
   FindClose(find_handle);
 }
 
 // Compares Windows style version strings (i.e. 1,2,3,4).  Returns true if b's
 // version is newer than a's, or false if it's equal or older.
 bool IsNewerVersion(const std::wstring& a, const std::wstring& b) {
   std::vector<std::wstring> a_ver, b_ver;
   SplitString(a, ',', &a_ver);
   SplitString(b, ',', &b_ver);
   if (a_ver.size() != b_ver.size())
     return false;
   for (size_t i = 0; i < a_ver.size(); i++) {
     int cur_a = StringToInt(a_ver[i]);
     int cur_b = StringToInt(b_ver[i]);
     if (cur_a > cur_b)
       return false;
     if (cur_a < cur_b)
       return true;
   }
   return false;
 }
 
-bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) {
-
+bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
+                                  std::vector<WebPluginInfo>* plugins) {
   // Version check
 
-  for (size_t i = 0; i < plugins_.size(); ++i) {
-    if (plugins_[i].path.BaseName() == info.path.BaseName() &&
-        !IsNewerVersion(plugins_[i].version, info.version)) {
+  for (size_t i = 0; i < plugins->size(); ++i) {
+    if ((*plugins)[i].path.BaseName() == info.path.BaseName() &&
+        !IsNewerVersion((*plugins)[i].version, info.version)) {
       return false;  // We already have a loaded plugin whose version is newer.
     }
   }
 
   // Troublemakers
 
   std::wstring filename = StringToLowerASCII(info.path.BaseName().value());
   // Depends on XPCOM.
   if (filename == kMozillaActiveXPlugin)
     return false;
@@ skipping 16 matching lines @@
   // We will use the ActiveX shim to handle embedded WMP media.
   if (use_internal_activex_shim_) {
     if (filename == kNewWMPPlugin || filename == kOldWMPPlugin)
       return false;
   } else {
     // If both the new and old WMP plugins exist, only load the new one.
     if (filename == kNewWMPPlugin) {
       if (dont_load_new_wmp_)
         return false;
 
-      for (size_t i = 0; i < plugins_.size(); ++i) {
-        if (plugins_[i].path.BaseName().value() == kOldWMPPlugin) {
-          plugins_.erase(plugins_.begin() + i);
+      for (size_t i = 0; i < plugins->size(); ++i) {
+        if ((*plugins)[i].path.BaseName().value() == kOldWMPPlugin) {
+          plugins->erase(plugins->begin() + i);
           break;
         }
       }
     } else if (filename == kOldWMPPlugin) {
-      for (size_t i = 0; i < plugins_.size(); ++i) {
-        if (plugins_[i].path.BaseName().value() == kNewWMPPlugin)
+      for (size_t i = 0; i < plugins->size(); ++i) {
+        if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
           return false;
       }
     }
   }
 
   return true;
 }
 
-void PluginList::LoadInternalPlugins() {
-#ifdef GEARS_STATIC_LIB
-  LoadPlugin(FilePath(kGearsPluginLibraryName));
-#endif
+void PluginList::LoadInternalPlugins(std::vector<WebPluginInfo>* plugins) {
+  if (!use_internal_activex_shim_)
 
-  if (!use_internal_activex_shim_)
-    return;
-
-  LoadPlugin(FilePath(kActiveXShimFileName));
-  LoadPlugin(FilePath(kActiveXShimFileNameForMediaPlayer));
+  LoadPlugin(FilePath(kActiveXShimFileName), plugins);
+  LoadPlugin(FilePath(kActiveXShimFileNameForMediaPlayer), plugins);
 }
 
 } // namespace NPAPI