Bug 1149566; disable e10s if dom.vr.enabled is true; r=mconley

This commit is contained in:
Vladimir Vukicevic 2015-04-01 16:02:20 -04:00
Родитель 24157e2002
Коммит 22acc69566
1 изменённых файлов: 5 добавлений и 0 удалений

Просмотреть файл

@ -4627,11 +4627,16 @@ mozilla::BrowserTabsRemoteAutostart()
// Nightly builds, update gBrowserTabsRemoteAutostart based on all the // Nightly builds, update gBrowserTabsRemoteAutostart based on all the
// e10s remote relayed prefs we watch. // 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.autostart.disabled-because-using-a11y", false);
// Disable for VR
bool disabledForVR = Preferences::GetBool("dom.vr.enabled", false);
if (prefEnabled) { if (prefEnabled) {
if (gSafeMode) { if (gSafeMode) {
LogE10sBlockedReason("Safe mode"); LogE10sBlockedReason("Safe mode");
} else if (disabledForA11y) { } else if (disabledForA11y) {
LogE10sBlockedReason("An accessibility tool is or was active. See bug 1115956."); LogE10sBlockedReason("An accessibility tool is or was active. See bug 1115956.");
} else if (disabledForVR) {
LogE10sBlockedReason("Experimental VR interfaces are enabled");
} else { } else {
gBrowserTabsRemoteAutostart = true; gBrowserTabsRemoteAutostart = true;
} }