Changeset 86456 in webkit

Timestamp:

May 13, 2011 12:54:33 PM (13 years ago)

Author:

Adam Roben

Message:

Load plugins in the order they're found

Fixes <​http://webkit.org/b/60788> <rdar://problem/9435787> REGRESSION (r69790): WebKit2
doesn't prefer plugins in the additional plugins directory

Reviewed by Anders Carlsson.

• UIProcess/Plugins/PluginInfoStore.cpp:

(WebKit::addFromVector):
Changed to use a ListHashSet instead of a HashSet to store the plugin paths.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/PluginInfoStore.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-13  Adam Roben  <aroben@apple.com>
+
+        Load plugins in the order they're found
+
+        Fixes <http://webkit.org/b/60788> <rdar://problem/9435787> REGRESSION (r69790): WebKit2
+        doesn't prefer plugins in the additional plugins directory
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        (WebKit::addFromVector):
+        Changed to use a ListHashSet instead of a HashSet to store the plugin paths.
+
 2011-05-13  Sam Weinig  <sam@webkit.org>
 

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

@@ -30 +30 @@
 #include <WebCore/MIMETypeRegistry.h>
 #include <algorithm>
+#include <wtf/ListHashSet.h>
 #include <wtf/StdLibExtras.h>
 
@@ -53 +54 @@
 }
 
-template <typename T, typename U, typename V, typename W>
-static void addFromVector(HashSet<T, U, V>& hashSet, const W& vector)
+template <typename T, typename U>
+static void addFromVector(T& hashSet, const U& vector)
 {
     for (size_t i = 0; i < vector.size(); ++i)
@@ -60 +61 @@
 }
 
+// We use a ListHashSet so that plugins will be loaded from the additional plugins directories first
+// (which in turn means those plugins will be preferred if two plugins claim the same MIME type).
 #if OS(WINDOWS)
-typedef HashSet<String, CaseFoldingHash> PathHashSet;
+typedef ListHashSet<String, 32, CaseFoldingHash> PathHashSet;
 #else
-typedef HashSet<String> PathHashSet;
+typedef ListHashSet<String, 32> PathHashSet;
 #endif