Changeset 31458 in webkit

Timestamp:

Mar 31, 2008 9:52:09 AM (16 years ago)

Author:

Adam Roben

Message:

Fix Bug 18214: WebKit will sometimes load duplicate plugins

<​http://bugs.webkit.org/show_bug.cgi?id=18214>

We now compare 3 things to determine if two PluginPackages are equal:

1) Name
2) Description
3) Supported MIME types

This matches Gecko's equality logic for plugins (implemented in
nsPluginTag::Equals).

Reviewed by Darin Adler.

• plugins/win/PluginPackageWin.cpp: (WebCore::PluginPackage::hash): Use the above-mentioned 3 criteria to calculate the hash. (WebCore::PluginPackage::equal): Use the above-mentioned 3 criteria to determine equality.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/win/PluginPackageWin.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-29  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 18214: WebKit will sometimes load duplicate plugins
+
+        <http://bugs.webkit.org/show_bug.cgi?id=18214>
+
+        We now compare 3 things to determine if two PluginPackages are equal:
+          1) Name
+          2) Description
+          3) Supported MIME types
+
+        This matches Gecko's equality logic for plugins (implemented in
+        nsPluginTag::Equals).
+
+        Reviewed by Darin Adler.
+
+        * plugins/win/PluginPackageWin.cpp:
+        (WebCore::PluginPackage::hash): Use the above-mentioned 3 criteria to
+        calculate the hash.
+        (WebCore::PluginPackage::equal): Use the above-mentioned 3 criteria to
+        determine equality.
+
 2008-03-31  Simon Hausmann  <hausmann@webkit.org>
 

trunk/WebCore/plugins/win/PluginPackageWin.cpp

@@ -361 +361 @@
 unsigned PluginPackage::hash() const
 { 
-    const unsigned hashCodes[3] = {
+    const unsigned hashCodes[] = {
+        m_name.impl()->hash(),
         m_description.impl()->hash(),
-        m_lastModified.dwLowDateTime,
-        m_lastModified.dwHighDateTime
+        m_mimeToExtensions.size()
     };
 
-    return StringImpl::computeHash(reinterpret_cast<const UChar*>(hashCodes), 3 * sizeof(unsigned) / sizeof(UChar));
+    return StringImpl::computeHash(reinterpret_cast<const UChar*>(hashCodes), sizeof(hashCodes) / sizeof(UChar));
 }
 
 bool PluginPackage::equal(const PluginPackage& a, const PluginPackage& b)
 {
-    return a.m_description == b.m_description && (CompareFileTime(&a.m_lastModified, &b.m_lastModified) == 0);
-}
-
-}
+    if (a.m_name != b.m_name)
+        return false;
+
+    if (a.m_description != b.m_description)
+        return false;
+
+    if (a.m_mimeToExtensions.size() != b.m_mimeToExtensions.size())
+        return false;
+
+    MIMEToExtensionsMap::const_iterator::Keys end = a.m_mimeToExtensions.end().keys();
+    for (MIMEToExtensionsMap::const_iterator::Keys it = a.m_mimeToExtensions.begin().keys(); it != end; ++it) {
+        if (!b.m_mimeToExtensions.contains(*it))
+            return false;
+    }
+
+    return true;
+}
+
+}