Changeset 138948 in webkit

Timestamp:

Jan 7, 2013 8:40:52 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r138944.
​http://trac.webkit.org/changeset/138944
​https://bugs.webkit.org/show_bug.cgi?id=106223

It made 28 tests crash (Requested by Ossy on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-01-07

• plugins/qt/PluginPackageQt.cpp:

(WebCore::PluginPackage::fetchInfo):
(WebCore::PluginPackage::load):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r138944.
+        http://trac.webkit.org/changeset/138944
+        https://bugs.webkit.org/show_bug.cgi?id=106223
+
+        It made 28 tests crash (Requested by Ossy on #webkit).
+
+        * plugins/qt/PluginPackageQt.cpp:
+        (WebCore::PluginPackage::fetchInfo):
+        (WebCore::PluginPackage::load):
+
 2013-01-07  peavo@outlook.com  <peavo@outlook.com>
 

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

@@ -39 +39 @@
 bool PluginPackage::fetchInfo()
 {
-    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;
-        }
-    }
+    if (!load())
+        return false;
 
     NPP_GetValueProcPtr gv = (NPP_GetValueProcPtr)m_module->resolve("NP_GetValue");
@@ -69 +62 @@
 
     setMIMEDescription(String::fromUTF8(gm()));
+    m_infoIsFromCache = false;
 
     return true;
@@ -162 +156 @@
         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 = 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;
     }