Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1164640 - Reset the flag for disabling e10s when an a11y tool is active. r=mconley

Browse Source 
There's now a blacklist in place for the tools that should be disabled, so we want to give another change for users with tools that are not blacklisted to test e10s.
This commit is contained in:
Felipe Gomes 2015-05-22 15:01:57 -03:00
parent de885c12ab
commit 851909f27e
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
browser/components/nsBrowserGlue.js
View File

@ -2785,7 +2785,7 @@ let E10SUINotification = {
let channelAuthorized = updateChannel == "nightly" || updateChannel == "aurora";
skipE10sChecks = !channelAuthorized ||
UpdateServices.prefs.getBoolPref("browser.tabs.remote.autostart.disabled-because-using-a11y");
Services.prefs.getBoolPref("browser.tabs.remote.disabled-for-a11y");
} catch(e) {}
if (skipE10sChecks) {
@ -2869,7 +2869,9 @@ let E10SUINotification = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
observe: function(subject, topic, data) {
if (topic == "a11y-init-or-shutdown" && data == "1") {
if (topic == "a11y-init-or-shutdown"
&& data == "1" &&
Services.appinfo.accessibilityIsBlacklistedForE10S) {
this._showE10sAccessibilityWarning();
}
},
@ -2959,7 +2961,15 @@ let E10SUINotification = {
_warnedAboutAccessibility: false,
_showE10sAccessibilityWarning: function() {
Services.prefs.setBoolPref("browser.tabs.remote.autostart.disabled-because-using-a11y", true);
try {
if (!Services.prefs.getBoolPref("browser.tabs.remote.disabled-for-a11y")) {
// Only return if the pref exists and was set to false, but not
// if the pref didn't exist (which will throw).
return;
}
} catch (e) { }
Services.prefs.setBoolPref("browser.tabs.remote.disabled-for-a11y", true);
if (this._warnedAboutAccessibility) {
return;
@ -2996,7 +3006,7 @@ let E10SUINotification = {
label: win.gNavigatorBundle.getString("e10s.accessibilityNotice.dontDisable.label"),
accessKey: win.gNavigatorBundle.getString("e10s.accessibilityNotice.dontDisable.accesskey"),
callback: function () {
Services.prefs.setBoolPref("browser.tabs.remote.autostart.disabled-because-using-a11y", false);
Services.prefs.setBoolPref("browser.tabs.remote.disabled-for-a11y", false);
}
}
];

2
toolkit/xre/nsAppRunner.cpp
View File

@ -4569,7 +4569,7 @@ mozilla::BrowserTabsRemoteAutostart()
#else
// Nightly builds, update gBrowserTabsRemoteAutostart based on all the
// e10s remote relayed prefs we watch.
bool disabledForA11y = Preferences::GetBool("browser.tabs.remote.autostart.disabled-because-using-a11y", false);
bool disabledForA11y = Preferences::GetBool("browser.tabs.remote.disabled-for-a11y", false);
// Disable for VR
bool disabledForVR = Preferences::GetBool("dom.vr.enabled", false);