Title: [138948] trunk/Source/WebCore
- Revision
- 138948
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-07 08:40:52 -0800 (Mon, 07 Jan 2013)
Log 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....@gmail.com> on 2013-01-07
* plugins/qt/PluginPackageQt.cpp:
(WebCore::PluginPackage::fetchInfo):
(WebCore::PluginPackage::load):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138947 => 138948)
--- trunk/Source/WebCore/ChangeLog 2013-01-07 16:32:16 UTC (rev 138947)
+++ trunk/Source/WebCore/ChangeLog 2013-01-07 16:40:52 UTC (rev 138948)
@@ -1,3 +1,15 @@
+2013-01-07 Sheriff Bot <webkit.review....@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 pe...@outlook.com <pe...@outlook.com>
[WinCairo] Build fixes after r138413
Modified: trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp (138947 => 138948)
--- trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2013-01-07 16:32:16 UTC (rev 138947)
+++ trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2013-01-07 16:40:52 UTC (rev 138948)
@@ -38,15 +38,8 @@
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");
NP_GetMIMEDescriptionFuncPtr gm =
@@ -68,6 +61,7 @@
determineModuleVersionFromDescription();
setMIMEDescription(String::fromUTF8(gm()));
+ m_infoIsFromCache = false;
return true;
}
@@ -161,14 +155,12 @@
if (isPluginBlacklisted())
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;
}
m_isLoaded = true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
