Bug 1282584: If we're not in the parent process, E10S must be on. r=jimm, a=sylvestre
authorMilan Sreckovic <milan@mozilla.com>
Thu, 30 Jun 2016 12:53:48 -0400
changeset 340034 2a0c3fd014516cd8718395e25a8cecd1fa29e0cb
parent 340033 517663b29d7ffc2ce91f90dc7beaac4fa35e52e5
child 340035 ebd239b4cbfb8eff833560f72b163275ac4026d3
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm, sylvestre
bugs1282584
milestone49.0a2
Bug 1282584: If we're not in the parent process, E10S must be on. r=jimm, a=sylvestre MozReview-Commit-ID: LtWxnZAzxCl
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4840,16 +4840,21 @@ MultiprocessBlockPolicy() {
 bool
 mozilla::BrowserTabsRemoteAutostart()
 {
   if (gBrowserTabsRemoteAutostartInitialized) {
     return gBrowserTabsRemoteAutostart;
   }
   gBrowserTabsRemoteAutostartInitialized = true;
 
+  // If we're in the content process, we are running E10S.
+  if (XRE_IsContentProcess()) {
+    gBrowserTabsRemoteAutostart = true;
+    return gBrowserTabsRemoteAutostart;
+  }
 
   bool optInPref = Preferences::GetBool("browser.tabs.remote.autostart", false);
   bool trialPref = Preferences::GetBool("browser.tabs.remote.autostart.2", false);
   bool prefEnabled = optInPref || trialPref;
   int status;
   if (optInPref) {
     status = kE10sEnabledByUser;
   } else if (trialPref) {