[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ed1eec0fa20dcd5804e1d9ee8c5db7fa448b42bd
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 18:14:54 2010 +0000

    Operate on m_plugins directly in PluginInfoStore::shouldUsePlugin
    
    We'll need to operate on m_plugins if we ever want to unload an
    already-loaded plugin before loading the new one.
    
    Fixes <http://webkit.org/b/49076> loadedPlugins parameter to
    PluginInfoStore::shouldUsePlugin is redundant
    
    Reviewed by Anders Carlsson.
    
    * UIProcess/Plugins/PluginInfoStore.cpp:
    (WebKit::PluginInfoStore::loadPlugin):
    * UIProcess/Plugins/PluginInfoStore.h:
    * UIProcess/Plugins/gtk/PluginInfoStoreGtk.cpp:
    (WebKit::PluginInfoStore::shouldUsePlugin):
    * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
    (WebKit::PluginInfoStore::shouldUsePlugin):
    * UIProcess/Plugins/qt/PluginInfoStoreQt.cpp:
    (WebKit::PluginInfoStore::shouldUsePlugin):
    * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
    (WebKit::PluginInfoStore::shouldUsePlugin):
    Removed the loadedPlugins parameter from shouldUsePlugin. The single
    implementation (Mac) now uses m_plugins directly.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d9092aa..6665c50 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,29 @@
+2010-11-05  Adam Roben  <aroben at apple.com>
+
+        Operate on m_plugins directly in PluginInfoStore::shouldUsePlugin
+
+        We'll need to operate on m_plugins if we ever want to unload an
+        already-loaded plugin before loading the new one.
+
+        Fixes <http://webkit.org/b/49076> loadedPlugins parameter to
+        PluginInfoStore::shouldUsePlugin is redundant
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        (WebKit::PluginInfoStore::loadPlugin):
+        * UIProcess/Plugins/PluginInfoStore.h:
+        * UIProcess/Plugins/gtk/PluginInfoStoreGtk.cpp:
+        (WebKit::PluginInfoStore::shouldUsePlugin):
+        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+        (WebKit::PluginInfoStore::shouldUsePlugin):
+        * UIProcess/Plugins/qt/PluginInfoStoreQt.cpp:
+        (WebKit::PluginInfoStore::shouldUsePlugin):
+        * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
+        (WebKit::PluginInfoStore::shouldUsePlugin):
+        Removed the loadedPlugins parameter from shouldUsePlugin. The single
+        implementation (Mac) now uses m_plugins directly.
+
 2010-11-05  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
index 4db9784..f4fb5ad 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
@@ -99,7 +99,7 @@ void PluginInfoStore::loadPlugin(const String& pluginPath)
     if (!getPluginInfo(pluginPath, plugin))
         return;
 
-    if (!shouldUsePlugin(plugin, m_plugins))
+    if (!shouldUsePlugin(plugin))
         return;
     
     // Add the plug-in.
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.h b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
index f3e669e..b342203 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.h
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
@@ -51,6 +51,8 @@ public:
         cpu_type_t pluginArchitecture;
         String bundleIdentifier;
         unsigned versionNumber;
+#elif PLATFORM(WIN)
+        uint64_t fileVersion;
 #endif
     };
 
@@ -79,7 +81,7 @@ private:
     // Returns paths to individual plug-ins that won't be found via pluginsDirectories/pluginPathsInDirectory.
     static Vector<String> individualPluginPaths();
     static bool getPluginInfo(const String& pluginPath, Plugin& plugin);
-    static bool shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins);
+    bool shouldUsePlugin(const Plugin& plugin);
     static String getMIMETypeForExtension(const String& extension);
 
     Vector<String> m_additionalPluginsDirectories;
diff --git a/WebKit2/UIProcess/Plugins/gtk/PluginInfoStoreGtk.cpp b/WebKit2/UIProcess/Plugins/gtk/PluginInfoStoreGtk.cpp
index 04e37db..8a6e86c 100644
--- a/WebKit2/UIProcess/Plugins/gtk/PluginInfoStoreGtk.cpp
+++ b/WebKit2/UIProcess/Plugins/gtk/PluginInfoStoreGtk.cpp
@@ -58,7 +58,7 @@ bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin)
     return false;
 }
 
-bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins)
+bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin)
 {
     notImplemented();
     return false;
diff --git a/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm b/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
index 902d42f..360d629 100644
--- a/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
+++ b/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
@@ -360,10 +360,10 @@ bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin)
     return true;
 }
 
-bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins)
+bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin)
 {
-    for (size_t i = 0; i < loadedPlugins.size(); ++i) {
-        const Plugin& loadedPlugin = loadedPlugins[i];
+    for (size_t i = 0; i < m_plugins.size(); ++i) {
+        const Plugin& loadedPlugin = m_plugins[i];
 
         // If a plug-in with the same bundle identifier already exists, we don't want to load it.
         if (loadedPlugin.bundleIdentifier == plugin.bundleIdentifier)
diff --git a/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp b/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
index 25dc0f7..b2c503c 100644
--- a/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
+++ b/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
@@ -89,7 +89,7 @@ bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin)
     return true;
 }
 
-bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins)
+bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin)
 {
     // We do not do any black-listing presently.
     return true;
diff --git a/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp b/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
index d5ae037..8eb860e 100644
--- a/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
+++ b/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
@@ -406,7 +406,7 @@ bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin)
     return true;
 }
 
-bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins)
+bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin)
 {
     // FIXME: <http://webkit.org/b/43509> Migrate logic here from
     // PluginDatabase::getPluginPathsInDirectories and PluginPackage::isPluginBlacklisted.

-- 
WebKit Debian packaging