Changeset 69790 in webkit

Timestamp:

Oct 14, 2010 12:22:27 PM (14 years ago)

Author:

Adam Roben

Message:

Make sure WebKit2 only loads each plugin once

Fixes <​http://webkit.org/b/47677> <rdar://problem/8552178> WebKit2 can
load the same plugin multiple times

Reviewed by Sam Weinig.

• UIProcess/Plugins/PluginInfoStore.cpp:

(WebKit::addFromVector): Helper function that adds all the elements
from a Vector to a HashSet.
(WebKit::PluginInfoStore::loadPluginsIfNecessary): Put all the plugin
paths into a HashSet, then load the plugins specified in the HashSet.
On Windows, the HashSet is case-insensitive, just like the file
system.

• UIProcess/Plugins/PluginInfoStore.h: Removed loadPluginsInDirectory,

which is no longer used.

• UIProcess/Plugins/win/PluginInfoStoreWin.cpp:

(WebKit::addPluginPathsFromRegistry):
(WebKit::PluginInfoStore::individualPluginPaths):
Changed to store the paths in a Vector instead of a HashSet now that
loadPluginsIfNecessary will handle duplicates for us.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/PluginInfoStore.cpp (modified) (2 diffs)
• UIProcess/Plugins/PluginInfoStore.h (modified) (1 diff)
• UIProcess/Plugins/win/PluginInfoStoreWin.cpp (modified) (4 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-14  Adam Roben  <aroben@apple.com>
+
+        Make sure WebKit2 only loads each plugin once
+
+        Fixes <http://webkit.org/b/47677> <rdar://problem/8552178> WebKit2 can
+        load the same plugin multiple times
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        (WebKit::addFromVector): Helper function that adds all the elements
+        from a Vector to a HashSet.
+        (WebKit::PluginInfoStore::loadPluginsIfNecessary): Put all the plugin
+        paths into a HashSet, then load the plugins specified in the HashSet.
+        On Windows, the HashSet is case-insensitive, just like the file
+        system.
+
+        * UIProcess/Plugins/PluginInfoStore.h: Removed loadPluginsInDirectory,
+        which is no longer used.
+
+        * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
+        (WebKit::addPluginPathsFromRegistry):
+        (WebKit::PluginInfoStore::individualPluginPaths):
+        Changed to store the paths in a Vector instead of a HashSet now that
+        loadPluginsIfNecessary will handle duplicates for us.
+
 2010-10-14  Adam Roben  <aroben@apple.com>
 

trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

@@ -52 +52 @@
 }
 
+template <typename T, typename U, typename V, typename W>
+static void addFromVector(HashSet<T, U, V>& hashSet, const W& vector)
+{
+    for (size_t i = 0; i < vector.size(); ++i)
+        hashSet.add(vector[i]);
+}
+
+#if OS(WINDOWS)
+typedef HashSet<String, CaseFoldingHash> PathHashSet;
+#else
+typedef HashSet<String> PathHashSet;
+#endif
+
 void PluginInfoStore::loadPluginsIfNecessary()
 {
@@ -59 +72 @@
     m_plugins.clear();
 
+    PathHashSet uniquePluginPaths;
+
     // First, load plug-ins from the additional plug-ins directories specified.
     for (size_t i = 0; i < m_additionalPluginsDirectories.size(); ++i)
-        loadPluginsInDirectory(m_additionalPluginsDirectories[i]);
+        addFromVector(uniquePluginPaths, pluginPathsInDirectory(m_additionalPluginsDirectories[i]));
 
     // Then load plug-ins from the standard plug-ins directories.
     Vector<String> directories = pluginsDirectories();
     for (size_t i = 0; i < directories.size(); ++i)
-        loadPluginsInDirectory(directories[i]);
+        addFromVector(uniquePluginPaths, pluginPathsInDirectory(directories[i]));
 
     // Then load plug-ins that are not in the standard plug-ins directories.
-    Vector<String> paths = individualPluginPaths();
-    for (size_t i = 0; i < paths.size(); ++i)
-        loadPlugin(paths[i]);
+    addFromVector(uniquePluginPaths, individualPluginPaths());
+
+    PathHashSet::const_iterator end = uniquePluginPaths.end();
+    for (PathHashSet::const_iterator it = uniquePluginPaths.begin(); it != end; ++it)
+        loadPlugin(*it);
 
     m_pluginListIsUpToDate = true;
-}
-
-void PluginInfoStore::loadPluginsInDirectory(const String& directory)
-{
-    Vector<String> pluginPaths = pluginPathsInDirectory(directory);
-    for (size_t i = 0; i < pluginPaths.size(); ++i)
-        loadPlugin(pluginPaths[i]);
 }
 

trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.h

@@ -69 +69 @@
 
     void loadPluginsIfNecessary();
-    void loadPluginsInDirectory(const String& directory);
     void loadPlugin(const String& pluginPath);
     

trunk/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp

@@ -30 +30 @@
 #include <WebCore/FileSystem.h>
 #include <shlwapi.h>
-#include <wtf/HashSet.h>
 #include <wtf/OwnArrayPtr.h>
-#include <wtf/text/StringHash.h>
 
 using namespace WebCore;
@@ -306 +304 @@
 }
 
-static void addPluginPathsFromRegistry(HKEY rootKey, HashSet<String, CaseFoldingHash>& paths)
+static void addPluginPathsFromRegistry(HKEY rootKey, Vector<String>& paths)
 {
     HKEY key;
@@ -327 +325 @@
             continue;
 
-        paths.add(path);
+        paths.append(path);
     }
 
@@ -335 +333 @@
 Vector<String> PluginInfoStore::individualPluginPaths()
 {
-    HashSet<String, CaseFoldingHash> paths;
+    Vector<String> paths;
 
     addPluginPathsFromRegistry(HKEY_LOCAL_MACHINE, paths);
     addPluginPathsFromRegistry(HKEY_CURRENT_USER, paths);
 
-    Vector<String> result;
-    copyToVector(paths, result);
-    return result;
+    return paths;
 }