Bug 1172491 - Let e10s be enabled in safe mode. r=felipe, a=sledru.
authorMike Conley <mconley@mozilla.com>
Wed, 10 Jun 2015 13:21:21 -0400
changeset 275061 48f907ce97b6b6131ddd2a74bb5d2f17a2cd736c
parent 275060 e9cbcee3f6da818a7a74ac599229b9eca8cfe041
child 275062 0265d4f00affdb2533d20e53240530334c2197d3
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe, sledru
bugs1172491
milestone40.0a2
Bug 1172491 - Let e10s be enabled in safe mode. r=felipe, a=sledru.
browser/base/content/browser.js
browser/components/customizableui/CustomizableWidgets.jsm
toolkit/xre/nsAppRunner.cpp
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7258,21 +7258,16 @@ let gPrivateBrowsingUI = {
 let gRemoteTabsUI = {
   init: function() {
     if (window.location.href != getBrowserURL() &&
         // Also check hidden window for the Mac no-window case
         window.location.href != "chrome://browser/content/hiddenWindow.xul") {
       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
       // a fallback to Basic Layers. This is incompatible with e10s.
       return;
     }
 #endif
 
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -1144,17 +1144,17 @@ if (Services.prefs.getBoolPref("browser.
           SocialService.uninstallProvider(origin, () => {});
         }
       }
     });
   }
 }
 
 #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.
 e10sDisabled |= Services.prefs.getBoolPref("layers.acceleration.disabled");
 #endif
 
 if (Services.appinfo.browserTabsRemoteAutostart) {
   CustomizableWidgets.push({
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4372,17 +4372,17 @@ LogE10sBlockedReason(const char *reason)
   }
 }
 #endif
 
 enum {
   kE10sEnabledByUser = 0,
   kE10sEnabledByDefault = 1,
   kE10sDisabledByUser = 2,
-  kE10sDisabledInSafeMode = 3,
+  // kE10sDisabledInSafeMode = 3, was removed in bug 1172491.
   kE10sDisabledForAccessibility = 4,
   kE10sDisabledForMacGfx = 5,
 };
 
 bool
 mozilla::BrowserTabsRemoteAutostart()
 {
   if (gBrowserTabsRemoteAutostartInitialized) {
@@ -4411,20 +4411,17 @@ mozilla::BrowserTabsRemoteAutostart()
 #else
   // Nightly builds, update gBrowserTabsRemoteAutostart based on all the
   // e10s remote relayed prefs we watch.
   bool disabledForA11y = Preferences::GetBool("browser.tabs.remote.disabled-for-a11y", false);
   // Disable for VR
   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) {
       LogE10sBlockedReason("Experimental VR interfaces are enabled");
     } else {
       gBrowserTabsRemoteAutostart = true;
     }
   }