wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1147156 - Re-enable e10s by default for Nightly users who may have disabled it. r=poirot,mconley

Browse Source
This commit is contained in:
Felipe Gomes 2015-04-06 15:06:46 -03:00
parent 27e7aef528
commit a2e378638d
7 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/app/b2g.js
View File

@ -29,6 +29,7 @@ pref("browser.sessionstore.restore_on_demand", false);
pref("browser.sessionstore.resume_from_crash", false);
// No e10s on mulet
pref("browser.tabs.remote.autostart.1", false);
pref("browser.tabs.remote.autostart.2", false);
#endif
// Bug 945235: Prevent all bars to be considered visible:

1
b2g/dev/app/mulet.js
View File

@ -17,3 +17,4 @@ pref("devtools.toolbox.sidebar.width", 800);
// nor the system app OOP, but only inner apps
pref("browser.tabs.remote.autostart", false);
pref("browser.tabs.remote.autostart.1", false);
pref("browser.tabs.remote.autostart.2", false);

6
browser/app/profile/firefox.js
View File

@ -1855,7 +1855,11 @@ pref("privacy.trackingprotection.ui.enabled", false);
#endif
#ifdef NIGHTLY_BUILD
pref("browser.tabs.remote.autostart.1", true);
// At the moment, autostart.2 is used, while autostart.1 is unused.
// We leave it here set to false to reset users' defaults and allow
// us to change everybody to true in the future, when desired.
pref("browser.tabs.remote.autostart.1", false);
pref("browser.tabs.remote.autostart.2", true);
#endif
#ifdef NIGHTLY_BUILD

2
browser/components/preferences/in-content/main.xul
View File

@ -14,7 +14,7 @@
name="browser.tabs.remote.autostart"
type="bool"/>
<preference id="e10sTempPref"
name="browser.tabs.remote.autostart.1"
name="browser.tabs.remote.autostart.2"
type="bool"/>
#endif

1
layout/tools/reftest/runreftest.py
View File

@ -222,6 +222,7 @@ class RefTest(object):
#Don't use auto-enabled e10s
prefs['browser.tabs.remote.autostart.1'] = False
prefs['browser.tabs.remote.autostart.2'] = False
if options.e10s:
prefs['browser.tabs.remote.autostart'] = True

1
testing/profiles/prefs_general.js
View File

@ -304,6 +304,7 @@ user_pref("media.decoder.heuristic.dormant.timeout", 0);
user_pref("browser.displayedE10SPrompt.1", 5);
// Don't use auto-enabled e10s
user_pref("browser.tabs.remote.autostart.1", false);
user_pref("browser.tabs.remote.autostart.2", false);
// Don't forceably kill content processes after a timeout
user_pref("dom.ipc.tabs.shutdownTimeoutSecs", 0);

2
toolkit/xre/nsAppRunner.cpp
View File

@ -4614,7 +4614,7 @@ mozilla::BrowserTabsRemoteAutostart()
}
gBrowserTabsRemoteAutostartInitialized = true;
bool optInPref = Preferences::GetBool("browser.tabs.remote.autostart", false);
bool trialPref = Preferences::GetBool("browser.tabs.remote.autostart.1", false);
bool trialPref = Preferences::GetBool("browser.tabs.remote.autostart.2", false);
bool prefEnabled = optInPref || trialPref;
#if !defined(NIGHTLY_BUILD)
// When running tests with 'layers.offmainthreadcomposition.testing.enabled' and