Bug 1241921: Disable async plugin init regardless of pref; r?jimm draft
authorAaron Klotz <aklotz@mozilla.com>
Mon, 17 Oct 2016 12:09:21 -0600
changeset 426072 a7bcd17059ac9afac01c9b9241812439ffae70ee
parent 426071 7af5d7627ad25757766dad2f01aef195f7aae1ec
child 534087 babd391c06de8ace3f955bc25b4cc9c2d0f7ce64
push id32610
push useraklotz@mozilla.com
push dateMon, 17 Oct 2016 18:46:48 +0000
reviewersjimm
bugs1241921
milestone52.0a1
Bug 1241921: Disable async plugin init regardless of pref; r?jimm MozReview-Commit-ID: 5cdb9vLONiS
dom/plugins/ipc/PluginModuleParent.cpp
--- 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");
     }