Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1189887: Enable async plugin init by default except when e10s is on; r=jimm

Browse Source 
--HG--
extra : rebase_source : 4dd7903fa5d9ab588f5cb1bf36df0c57701ae1bd
This commit is contained in:
Aaron Klotz 2015-07-31 13:39:42 -06:00
parent 17ecefdf0b
commit 3e8b0857ab
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/plugins/ipc/PluginModuleParent.cpp
View File

@ -33,6 +33,7 @@
#include "nsCRT.h"
#include "nsIFile.h"
#include "nsIObserverService.h"
#include "nsIXULRuntime.h"
#include "nsNPAPIPlugin.h"
#include "nsPrintfCString.h"
#include "prsystem.h"
@ -641,7 +642,9 @@ PluginModuleParent::PluginModuleParent(bool aIsChrome)
, mAsyncNewRv(NS_ERROR_NOT_INITIALIZED)
{
#if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK)
mIsStartingAsync = Preferences::GetBool(kAsyncInitPref, false);
// Until some e10s bugs are resolved, disable asyncInit with e10s
mIsStartingAsync = Preferences::GetBool(kAsyncInitPref, false) &&
!BrowserTabsRemoteAutostart();
#if defined(MOZ_CRASHREPORTER)
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AsyncPluginInit"),
mIsStartingAsync ?

7
modules/libpref/init/all.js
View File

@ -2540,13 +2540,8 @@ pref("dom.ipc.plugins.reportCrashURL", true);
// Defaults to 30 seconds.
pref("dom.ipc.plugins.unloadTimeoutSecs", 30);
// Asynchronous plugin initialization should only be enabled on non-e10s
// channels until some remaining bugs are resolved.
#ifdef E10S_TESTING_ONLY
pref("dom.ipc.plugins.asyncInit", false);
#else
// Asynchronous plugin initialization should be enabled by default.
pref("dom.ipc.plugins.asyncInit", true);
#endif
pref("dom.ipc.processCount", 1);