mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-25 16:47:29 +09:00
Fix the preference for e10s (enabled by default, disable if user wants to)
This commit is contained in:
parent
b386e2fed1
commit
498b121c86
3 changed files with 11 additions and 0 deletions
|
|
@ -919,6 +919,7 @@ pref("dom.ipc.shims.enabledWarnings", false);
|
||||||
// Start the browser in e10s mode
|
// Start the browser in e10s mode
|
||||||
pref("browser.tabs.remote.autostart", true);
|
pref("browser.tabs.remote.autostart", true);
|
||||||
pref("browser.tabs.remote.force-enable", true);
|
pref("browser.tabs.remote.force-enable", true);
|
||||||
|
pref("browser.tabs.remote.force-disable", false);
|
||||||
pref("browser.tabs.remote.desktopbehavior", true);
|
pref("browser.tabs.remote.desktopbehavior", true);
|
||||||
pref("browser.tabs.remote.ignoreBlockPolicy", true);
|
pref("browser.tabs.remote.ignoreBlockPolicy", true);
|
||||||
// Number of web content processes used by e10s.
|
// Number of web content processes used by e10s.
|
||||||
|
|
|
||||||
|
|
@ -178,15 +178,20 @@ var gAdvancedPane = {
|
||||||
|
|
||||||
readE10sEnabled: function ()
|
readE10sEnabled: function ()
|
||||||
{
|
{
|
||||||
|
let forceDisable = document.getElementById("browser.tabs.remote.force-disable").value;
|
||||||
let forceEnable = document.getElementById("browser.tabs.remote.force-enable").value;
|
let forceEnable = document.getElementById("browser.tabs.remote.force-enable").value;
|
||||||
let autostart = document.getElementById("browser.tabs.remote.autostart").value;
|
let autostart = document.getElementById("browser.tabs.remote.autostart").value;
|
||||||
let trialAutostart = document.getElementById("browser.tabs.remote.autostart.2").value;
|
let trialAutostart = document.getElementById("browser.tabs.remote.autostart.2").value;
|
||||||
|
if (forceDisable) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
return !!(forceEnable || autostart || trialAutostart);
|
return !!(forceEnable || autostart || trialAutostart);
|
||||||
},
|
},
|
||||||
|
|
||||||
writeE10sEnabled: function ()
|
writeE10sEnabled: function ()
|
||||||
{
|
{
|
||||||
let enabled = document.getElementById("e10sEnabled").checked;
|
let enabled = document.getElementById("e10sEnabled").checked;
|
||||||
|
document.getElementById("browser.tabs.remote.force-disable").value = !enabled;
|
||||||
document.getElementById("browser.tabs.remote.force-enable").value = enabled;
|
document.getElementById("browser.tabs.remote.force-enable").value = enabled;
|
||||||
document.getElementById("browser.tabs.remote.autostart").value = enabled;
|
document.getElementById("browser.tabs.remote.autostart").value = enabled;
|
||||||
document.getElementById("browser.tabs.remote.autostart.2").value = enabled;
|
document.getElementById("browser.tabs.remote.autostart.2").value = enabled;
|
||||||
|
|
@ -208,6 +213,7 @@ var gAdvancedPane = {
|
||||||
|
|
||||||
let buttonIndex = confirmRestartPrompt(enabled, 1, true, false);
|
let buttonIndex = confirmRestartPrompt(enabled, 1, true, false);
|
||||||
if (buttonIndex == CONFIRM_RESTART_PROMPT_RESTART_NOW) {
|
if (buttonIndex == CONFIRM_RESTART_PROMPT_RESTART_NOW) {
|
||||||
|
document.getElementById("browser.tabs.remote.force-disable").value = !enabled;
|
||||||
document.getElementById("browser.tabs.remote.force-enable").value = enabled;
|
document.getElementById("browser.tabs.remote.force-enable").value = enabled;
|
||||||
document.getElementById("browser.tabs.remote.autostart").value = enabled;
|
document.getElementById("browser.tabs.remote.autostart").value = enabled;
|
||||||
document.getElementById("browser.tabs.remote.autostart.2").value = enabled;
|
document.getElementById("browser.tabs.remote.autostart.2").value = enabled;
|
||||||
|
|
@ -219,6 +225,7 @@ var gAdvancedPane = {
|
||||||
|
|
||||||
this._shouldPromptForE10sRestart = false;
|
this._shouldPromptForE10sRestart = false;
|
||||||
checkbox.checked = this._storedE10sEnabled;
|
checkbox.checked = this._storedE10sEnabled;
|
||||||
|
document.getElementById("browser.tabs.remote.force-disable").value = !this._storedE10sEnabled;
|
||||||
document.getElementById("browser.tabs.remote.force-enable").value = this._storedE10sEnabled;
|
document.getElementById("browser.tabs.remote.force-enable").value = this._storedE10sEnabled;
|
||||||
document.getElementById("browser.tabs.remote.autostart").value = this._storedE10sEnabled;
|
document.getElementById("browser.tabs.remote.autostart").value = this._storedE10sEnabled;
|
||||||
document.getElementById("browser.tabs.remote.autostart.2").value = this._storedE10sEnabled;
|
document.getElementById("browser.tabs.remote.autostart.2").value = this._storedE10sEnabled;
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,9 @@
|
||||||
<preference id="browser.tabs.remote.force-enable"
|
<preference id="browser.tabs.remote.force-enable"
|
||||||
name="browser.tabs.remote.force-enable"
|
name="browser.tabs.remote.force-enable"
|
||||||
type="bool"/>
|
type="bool"/>
|
||||||
|
<preference id="browser.tabs.remote.force-disable"
|
||||||
|
name="browser.tabs.remote.force-disable"
|
||||||
|
type="bool"/>
|
||||||
|
|
||||||
<!-- Network tab -->
|
<!-- Network tab -->
|
||||||
<preference id="browser.cache.disk.capacity"
|
<preference id="browser.cache.disk.capacity"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue