Bug 1282584: If we're not in the parent process, E10S must be on ON A CLOSED TREE. r=jimm, a=sylvestre FIREFOX_48_0_BUILD2 FIREFOX_48_0_RELEASE
authorMilan Sreckovic <milan@mozilla.com>
Thu, 30 Jun 2016 12:53:48 -0400
changeset 398084 c1de04f39fa956cfce83f6065b0e709369215ed5
parent 398083 fd1e1d7cfb68529e55bd8e1353e05b8c4b39ccf9
child 398085 2bab1002e68ede45620b6505d5a38c80aaa6288b
push id25443
push userfelipc@gmail.com
push dateMon, 08 Aug 2016 17:54:21 +0000
reviewersjimm, sylvestre
bugs1282584
milestone48.0
Bug 1282584: If we're not in the parent process, E10S must be on ON A CLOSED TREE. r=jimm, a=sylvestre MozReview-Commit-ID: LtWxnZAzxCl
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4815,16 +4815,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) {