Bug 1282584: If we're not in the parent process, E10S must be on. r?jimm draft
authorMilan Sreckovic <milan@mozilla.com>
Thu, 30 Jun 2016 12:53:48 -0400
changeset 382840 2bbefb3a45ea055f05c67a27f620b05996302bfb
parent 382798 82e1f1b9c0559f38a8460e2f2f3044de4c7712d6
child 524307 fece00bb7e33914dabb05211a33f60c59ffeb706
push id21842
push usermsreckovic@mozilla.com
push dateThu, 30 Jun 2016 16:54:06 +0000
reviewersjimm
bugs1282584
milestone50.0a1
Bug 1282584: If we're not in the parent process, E10S must be on. r?jimm MozReview-Commit-ID: LtWxnZAzxCl
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4864,16 +4864,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) {