mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 13:25:37 +00:00
Backed out changeset a2f3a6818c4d (bug 1189887) for test_instance_re-parent.html failures CLOSED TREE
This commit is contained in:
parent
e2ed929e0c
commit
6fe397ef93
@ -33,7 +33,6 @@
|
|||||||
#include "nsCRT.h"
|
#include "nsCRT.h"
|
||||||
#include "nsIFile.h"
|
#include "nsIFile.h"
|
||||||
#include "nsIObserverService.h"
|
#include "nsIObserverService.h"
|
||||||
#include "nsIXULRuntime.h"
|
|
||||||
#include "nsNPAPIPlugin.h"
|
#include "nsNPAPIPlugin.h"
|
||||||
#include "nsPrintfCString.h"
|
#include "nsPrintfCString.h"
|
||||||
#include "prsystem.h"
|
#include "prsystem.h"
|
||||||
@ -642,9 +641,7 @@ PluginModuleParent::PluginModuleParent(bool aIsChrome)
|
|||||||
, mAsyncNewRv(NS_ERROR_NOT_INITIALIZED)
|
, mAsyncNewRv(NS_ERROR_NOT_INITIALIZED)
|
||||||
{
|
{
|
||||||
#if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK)
|
#if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK)
|
||||||
// Until some e10s bugs are resolved, disable asyncInit with e10s
|
mIsStartingAsync = Preferences::GetBool(kAsyncInitPref, false);
|
||||||
mIsStartingAsync = Preferences::GetBool(kAsyncInitPref, false) &&
|
|
||||||
!BrowserTabsRemoteAutostart();
|
|
||||||
#if defined(MOZ_CRASHREPORTER)
|
#if defined(MOZ_CRASHREPORTER)
|
||||||
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AsyncPluginInit"),
|
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AsyncPluginInit"),
|
||||||
mIsStartingAsync ?
|
mIsStartingAsync ?
|
||||||
|
@ -2540,8 +2540,13 @@ pref("dom.ipc.plugins.reportCrashURL", true);
|
|||||||
// Defaults to 30 seconds.
|
// Defaults to 30 seconds.
|
||||||
pref("dom.ipc.plugins.unloadTimeoutSecs", 30);
|
pref("dom.ipc.plugins.unloadTimeoutSecs", 30);
|
||||||
|
|
||||||
// Asynchronous plugin initialization should be enabled by default.
|
// 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
|
||||||
pref("dom.ipc.plugins.asyncInit", true);
|
pref("dom.ipc.plugins.asyncInit", true);
|
||||||
|
#endif
|
||||||
|
|
||||||
pref("dom.ipc.processCount", 1);
|
pref("dom.ipc.processCount", 1);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user