Changeset 141240 in webkit

Timestamp:

Jan 30, 2013 2:34:24 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Major performance improvement in Qt's PluginDatabase implementation
​https://bugs.webkit.org/show_bug.cgi?id=106140

Patch by David Faure <​faure@kde.org> on 2013-01-30
Reviewed by Simon Hausmann.

No new tests, only a performance improvement.

• plugins/qt/PluginPackageQt.cpp:

(WebCore::PluginPackage::fetchInfo): Don't do a full-fledged load(), load the module directly.
Keep the refcounting as it was before (broken, but otherwise flash crashes).
(WebCore::PluginPackage::load): Use existing module if fetchInfo created it.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/qt/PluginPackageQt.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  David Faure  <faure@kde.org>
+
+        [Qt] Major performance improvement in Qt's PluginDatabase implementation
+        https://bugs.webkit.org/show_bug.cgi?id=106140
+
+        Reviewed by Simon Hausmann.
+
+        No new tests, only a performance improvement.
+
+        * plugins/qt/PluginPackageQt.cpp:
+        (WebCore::PluginPackage::fetchInfo): Don't do a full-fledged load(), load the module directly.
+        Keep the refcounting as it was before (broken, but otherwise flash crashes).
+        (WebCore::PluginPackage::load): Use existing module if fetchInfo created it.
+
 2013-01-30  Huang Dongsung  <luxtella@company100.net>
 

trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp

@@ -39 +39 @@
 bool PluginPackage::fetchInfo()
 {
-    if (!load())
-        return false;
+    if (!m_module) {
+        m_module = new QLibrary((QString)m_path);
+        m_module->setLoadHints(QLibrary::ResolveAllSymbolsHint);
+        if (!m_module->load()) {
+            LOG(Plugins, "%s not loaded (%s)", m_path.utf8().data(),
+                m_module->errorString().toLatin1().constData());
+            return false;
+        }
+        // This is technically wrong (not matched by a decrement), but
+        // it matches the previous behavior (fetchInfo calling load) and
+        // prevents crashes in flash due to unload+load.
+        m_loadCount++;
+    }
 
     NPP_GetValueProcPtr gv = (NPP_GetValueProcPtr)m_module->resolve("NP_GetValue");
@@ -62 +73 @@
 
     setMIMEDescription(String::fromUTF8(gm()));
-    m_infoIsFromCache = false;
 
     return true;
@@ -156 +166 @@
         return false;
 
-    m_module = new QLibrary((QString)m_path);
-    m_module->setLoadHints(QLibrary::ResolveAllSymbolsHint);
-    if (!m_module->load()) {
-        LOG(Plugins, "%s not loaded (%s)", m_path.utf8().data(),
+    if (!m_module) {
+        m_module = new QLibrary((QString)m_path);
+        m_module->setLoadHints(QLibrary::ResolveAllSymbolsHint);
+        if (!m_module->load()) {
+            LOG(Plugins, "%s not loaded (%s)", m_path.utf8().data(),
                 m_module->errorString().toLatin1().constData());
-        return false;
+            return false;
+        }
     }