Bug 1241921: Disable async plugin init regardless of pref; r?jimm
MozReview-Commit-ID: 5cdb9vLONiS
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -681,27 +681,22 @@ PluginModuleParent::PluginModuleParent(b
, mTaskFactory(this)
, mSandboxLevel(0)
, mIsFlashPlugin(false)
, mIsStartingAsync(false)
, mNPInitialized(false)
, mIsNPShutdownPending(false)
, mAsyncNewRv(NS_ERROR_NOT_INITIALIZED)
{
-#if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK)
- mIsStartingAsync = aAllowAsyncInit &&
- Preferences::GetBool(kAsyncInitPref, false) &&
- !BrowserTabsRemoteAutostart();
#if defined(MOZ_CRASHREPORTER)
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AsyncPluginInit"),
mIsStartingAsync ?
NS_LITERAL_CSTRING("1") :
NS_LITERAL_CSTRING("0"));
#endif
-#endif
}
PluginModuleParent::~PluginModuleParent()
{
if (!OkToCleanup()) {
NS_RUNTIMEABORT("unsafe destruction");
}