Changeset 31466 in webkit

Timestamp:

Mar 31, 2008 9:56:15 AM (16 years ago)

Author:

Adam Roben

Message:

Fix Bug 18208: Acid3 test 65 takes >33ms due to plugin refreshing on Windows

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

We now keep track of all the plugin paths found each time refresh() is
called. We'll only instantiate PluginPackages if there are new paths
or paths with changed timestamps since the last time refresh() was
called.

Reviewed by Darin Adler and Anders Carlsson.

• plugins/PluginDatabase.cpp: (WebCore::PluginDatabase::refresh):
  • Only instantiate PluginPackages if there is a new path or a path with a changed timestamp since we last ran refresh().
  • Cache the set of plugin paths found and their timestamps for the next call to refresh().
  • Only re-register MIME types if our set of plugins changed.
• plugins/PluginDatabase.h: Added a new member to cache plugin paths and their timestamps.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginDatabase.cpp (modified) (5 diffs)
• plugins/PluginDatabase.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-29  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 18208: Acid3 test 65 takes >33ms due to plugin refreshing on
+        Windows
+
+        <http://bugs.webkit.org/show_bug.cgi?id=18208>
+
+        We now keep track of all the plugin paths found each time refresh() is
+        called. We'll only instantiate PluginPackages if there are new paths
+        or paths with changed timestamps since the last time refresh() was
+        called.
+
+        Reviewed by Darin Adler and Anders Carlsson.
+
+        * plugins/PluginDatabase.cpp:
+        (WebCore::PluginDatabase::refresh):
+          - Only instantiate PluginPackages if there is a new path or a path
+            with a changed timestamp since we last ran refresh().
+          - Cache the set of plugin paths found and their timestamps for the
+            next call to refresh().
+          - Only re-register MIME types if our set of plugins changed.
+        * plugins/PluginDatabase.h: Added a new member to cache plugin paths
+        and their timestamps.
+
 2008-03-29  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/plugins/PluginDatabase.cpp

@@ -69 +69 @@
 
     if (!m_plugins.isEmpty()) {
-        m_registeredMIMETypes.clear();
-
         PluginSet pluginsToUnload;
         getDeletedPlugins(pluginsToUnload);
@@ -84 +82 @@
     HashSet<String> paths;
     getPluginPathsInDirectories(paths);
+
+    HashMap<String, time_t> pathsWithTimes;
+
+    // We should only skip unchanged files if we didn't remove any plugins above. If we did remove
+    // any plugins, we need to look at every plugin file so that, e.g., if the user has two versions
+    // of RealPlayer installed and just removed the newer one, we'll pick up the older one.
+    bool shouldSkipUnchangedFiles = !pluginSetChanged;
 
     HashSet<String>::const_iterator pathsEnd = paths.end();
@@ -91 +96 @@
             continue;
 
+        pathsWithTimes.add(*it, lastModified);
+
+        // If the path's timestamp hasn't changed since the last time we ran refresh(), we don't have to do anything.
+        if (shouldSkipUnchangedFiles && m_pluginPathsWithTimes.get(*it) == lastModified)
+            continue;
+
         if (RefPtr<PluginPackage> oldPackage = m_pluginsByPath.get(*it)) {
-            if (oldPackage->lastModified() == lastModified)
-                continue;
+            ASSERT(!shouldSkipUnchangedFiles || oldPackage->lastModified() != lastModified);
             remove(oldPackage.get());
         }
@@ -100 +110 @@
             pluginSetChanged = true;
     }
+
+    // Cache all the paths we found with their timestamps for next time.
+    pathsWithTimes.swap(m_pluginPathsWithTimes);
+
+    if (!pluginSetChanged)
+        return false;
+
+    m_registeredMIMETypes.clear();
 
     // Register plug-in MIME types
@@ -111 +129 @@
     }
 
-    return pluginSetChanged;
+    return true;
 }
 

trunk/WebCore/plugins/PluginDatabase.h

@@ -77 +77 @@
         PluginSet m_plugins;
         HashMap<String, RefPtr<PluginPackage> > m_pluginsByPath;
+        HashMap<String, time_t> m_pluginPathsWithTimes;
     };