Changeset 85978 in webkit

Timestamp:

May 6, 2011 2:17:42 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-06 Anders Carlsson <​andersca@apple.com>

Reviewed by Dan Bernstein.

Make more PluginInfoStore member functions static
​https://bugs.webkit.org/show_bug.cgi?id=60401

This is a first step towards making PluginInfoStore thread safe.

• UIProcess/Plugins/PluginInfoStore.cpp: (WebKit::PluginInfoStore::loadPluginsIfNecessary): (WebKit::PluginInfoStore::loadPlugin):
• UIProcess/Plugins/PluginInfoStore.h:
• UIProcess/Plugins/mac/PluginInfoStoreMac.mm: (WebKit::PluginInfoStore::shouldUsePlugin):
• UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: (WebKit::PluginInfoStore::shouldUsePlugin):
• UIProcess/Plugins/win/PluginInfoStoreWin.cpp: (WebKit::PluginInfoStore::shouldUsePlugin):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/PluginInfoStore.cpp (modified) (3 diffs)
• UIProcess/Plugins/PluginInfoStore.h (modified) (1 diff)
• UIProcess/Plugins/mac/PluginInfoStoreMac.mm (modified) (1 diff)
• UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp (modified) (1 diff)
• UIProcess/Plugins/win/PluginInfoStoreWin.cpp (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-06  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Make more PluginInfoStore member functions static
+        https://bugs.webkit.org/show_bug.cgi?id=60401
+
+        This is a first step towards making PluginInfoStore thread safe.
+
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        (WebKit::PluginInfoStore::loadPluginsIfNecessary):
+        (WebKit::PluginInfoStore::loadPlugin):
+        * UIProcess/Plugins/PluginInfoStore.h:
+        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+        (WebKit::PluginInfoStore::shouldUsePlugin):
+        * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:
+        (WebKit::PluginInfoStore::shouldUsePlugin):
+        * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
+        (WebKit::PluginInfoStore::shouldUsePlugin):
+
 2011-05-06  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

@@ -71 +71 @@
         return;
 
-    m_plugins.clear();
-
     PathHashSet uniquePluginPaths;
 
@@ -87 +85 @@
     addFromVector(uniquePluginPaths, individualPluginPaths());
 
+    Vector<Plugin> plugins;
+
     PathHashSet::const_iterator end = uniquePluginPaths.end();
     for (PathHashSet::const_iterator it = uniquePluginPaths.begin(); it != end; ++it)
-        loadPlugin(*it);
-
+        loadPlugin(plugins, *it);
+
+    m_plugins.swap(plugins);
     m_pluginListIsUpToDate = true;
 }
 
-void PluginInfoStore::loadPlugin(const String& pluginPath)
+void PluginInfoStore::loadPlugin(Vector<Plugin>& plugins, const String& pluginPath)
 {
     Plugin plugin;
@@ -101 +102 @@
         return;
 
-    if (!shouldUsePlugin(plugin))
+    if (!shouldUsePlugin(plugins, plugin))
         return;
     
-    // Add the plug-in.
-    m_plugins.append(plugin);
+    plugins.append(plugin);
 }
 

trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h

@@ -76 +76 @@
 
     void loadPluginsIfNecessary();
-    void loadPlugin(const String& pluginPath);
+    static void loadPlugin(Vector<Plugin>& plugins, const String& pluginPath);
     
-    // Platform-specific member functions
+    // Platform-specific member functions:
 
     // Returns paths to directories that should be searched for plug-ins (via pluginPathsInDirectory).
     static Vector<String> pluginsDirectories();
+
     // Returns paths to all plug-ins in the specified directory.
     static Vector<String> pluginPathsInDirectory(const String& directory);
+
     // Returns paths to individual plug-ins that won't be found via pluginsDirectories/pluginPathsInDirectory.
     static Vector<String> individualPluginPaths();
+
+    // Load plug-in info for the plug-in with the specified path.
     static bool getPluginInfo(const String& pluginPath, Plugin& plugin);
-    bool shouldUsePlugin(const Plugin& plugin);
+
+    // Return whether this plug-in should be used (added to the list of plug-ins) or not.
+    static bool shouldUsePlugin(Vector<Plugin>& alreadyLoadedPlugins, const Plugin&);
+
+    // Get the MIME type for the given extension.
     static String getMIMETypeForExtension(const String& extension);
 

trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm

@@ -77 +77 @@
 }
 
-bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin)
+bool PluginInfoStore::shouldUsePlugin(Vector<Plugin>& alreadyLoadedPlugins, const Plugin& plugin)
 {
-    for (size_t i = 0; i < m_plugins.size(); ++i) {
-        const Plugin& loadedPlugin = m_plugins[i];
+    for (size_t i = 0; i < alreadyLoadedPlugins.size(); ++i) {
+        const Plugin& loadedPlugin = alreadyLoadedPlugins[i];
 
         // If a plug-in with the same bundle identifier already exists, we don't want to load it.

trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp

@@ -65 +65 @@
 }
 
-bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin)
+bool PluginInfoStore::shouldUsePlugin(Vector<Plugin>& alreadyLoadedPlugins, const Plugin& plugin)
 {
     // We do not do any black-listing presently.

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

@@ -339 +339 @@
 }
 
-bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin)
+bool PluginInfoStore::shouldUsePlugin(const Vector<Plugin>& alreadyLoadedPlugins, const Plugin& plugin)
 {
     if (plugin.info.name == "Citrix ICA Client") {
@@ -374 +374 @@
         // Don't load the old Windows Media Player plugin if we've already loaded the new Windows
         // Media Player plugin.
-        for (size_t i = 0; i < m_plugins.size(); ++i) {
-            if (!isNewWindowsMediaPlayerPlugin(m_plugins[i]))
+        for (size_t i = 0; i < alreadyLoadedPlugins.size(); ++i) {
+            if (!isNewWindowsMediaPlayerPlugin(alreadyLoadedPlugins[i]))
                 continue;
             return false;
@@ -383 +383 @@
 
     if (isNewWindowsMediaPlayerPlugin(plugin)) {
-        // Unload the old Windows Media Player plugin if we've already loaded it.
+        // Remove the old Windows Media Player plugin if we've already added it.
         for (size_t i = 0; i < m_plugins.size(); ++i) {
             if (!isOldWindowsMediaPlayerPlugin(m_plugins[i]))
                 continue;
-            m_plugins.remove(i);
+            alreadyLoadedPlugins.remove(i);
         }
         return true;
@@ -395 +395 @@
     // only the first. <http://webkit.org/b/58469>
     String pluginFileName = pathGetFileName(plugin.path);
-    for (size_t i = 0; i < m_plugins.size(); ++i) {
-        Plugin& loadedPlugin = m_plugins[i];
+    for (size_t i = 0; i < alreadyLoadedPlugins.size(); ++i) {
+        const Plugin& loadedPlugin = alreadyLoadedPlugins[i];
 
         // If a plug-in with the same filename already exists, we don't want to load it.