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 1172491 - Let e10s be enabled in safe mode. r=felipe

Browse Source
This commit is contained in:
Mike Conley 2015-06-10 13:21:21 -04:00
parent fdea62831d
commit 565dcfae6b
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/base/content/browser.js
View File

@ -7187,11 +7187,6 @@ let gRemoteTabsUI = {
return;
}
if (Services.appinfo.inSafeMode) {
// e10s isn't supported in safe mode, so don't show the menu items for it
return;
}
#ifdef XP_MACOSX
if (Services.prefs.getBoolPref("layers.acceleration.disabled")) {
// On OS X, "Disable Hardware Acceleration" also disables OMTC and forces

2
browser/components/customizableui/CustomizableWidgets.jsm
View File

@ -1126,7 +1126,7 @@ if (Services.prefs.getBoolPref("browser.pocket.enabled")) {
}
#ifdef E10S_TESTING_ONLY
let e10sDisabled = Services.appinfo.inSafeMode;
let e10sDisabled = false;
#ifdef XP_MACOSX
// On OS X, "Disable Hardware Acceleration" also disables OMTC and forces
// a fallback to Basic Layers. This is incompatible with e10s.

7
toolkit/xre/nsAppRunner.cpp
View File

@ -4548,7 +4548,7 @@ enum {
kE10sEnabledByUser = 0,
kE10sEnabledByDefault = 1,
kE10sDisabledByUser = 2,
kE10sDisabledInSafeMode = 3,
// kE10sDisabledInSafeMode = 3, was removed in bug 1172491.
kE10sDisabledForAccessibility = 4,
kE10sDisabledForMacGfx = 5,
};
@ -4587,10 +4587,7 @@ mozilla::BrowserTabsRemoteAutostart()
bool disabledForVR = Preferences::GetBool("dom.vr.enabled", false);
if (prefEnabled) {
if (gSafeMode) {
status = kE10sDisabledInSafeMode;
LogE10sBlockedReason("Safe mode");
} else if (disabledForA11y) {
if (disabledForA11y) {
status = kE10sDisabledForAccessibility;
LogE10sBlockedReason("An accessibility tool is or was active. See bug 1115956.");
} else if (disabledForVR) {