Bug 1117934 - Re-enable e10s by default on Nightly 38. r=felipe.
authorMike Conley <mconley@mozilla.com>
Tue, 13 Jan 2015 10:49:33 -0500
changeset 223559 4f8e3c881cd8768b1c8963abe8fd17f543eab046
parent 223558 ad469f83659d2eed690cfe417edf7e8effba89a6
child 223560 291e3a83a122332f3f94869e7dc2b9c7db06e526
push id10796
push usermconley@mozilla.com
push dateTue, 13 Jan 2015 16:34:32 +0000
treeherderfx-team@4f8e3c881cd8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe
bugs1117934
milestone38.0a1
Bug 1117934 - Re-enable e10s by default on Nightly 38. r=felipe.
browser/app/profile/firefox.js
browser/components/nsBrowserGlue.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1778,17 +1778,17 @@ pref("media.gmp-gmpopenh264.provider.ena
 pref("browser.apps.URL", "https://marketplace.firefox.com/discovery/");
 
 #ifdef NIGHTLY_BUILD
 pref("browser.polaris.enabled", false);
 pref("privacy.trackingprotection.ui.enabled", false);
 #endif
 
 #ifdef NIGHTLY_BUILD
-pref("browser.tabs.remote.autostart.1", false);
+pref("browser.tabs.remote.autostart.1", true);
 #endif
 
 // Temporary pref to allow printing in e10s windows on some platforms.
 #ifdef UNIX_BUT_NOT_MAC
 pref("print.enable_e10s_testing", false);
 #else
 pref("print.enable_e10s_testing", true);
 #endif
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -2497,17 +2497,17 @@ let DefaultBrowserCheck = {
     }
   },
 };
 
 #ifdef E10S_TESTING_ONLY
 let E10SUINotification = {
   // Increase this number each time we want to roll out an
   // e10s testing period to Nightly users.
-  CURRENT_NOTICE_COUNT: 3,
+  CURRENT_NOTICE_COUNT: 4,
   CURRENT_PROMPT_PREF: "browser.displayedE10SPrompt.1",
   PREVIOUS_PROMPT_PREF: "browser.displayedE10SPrompt",
 
   checkStatus: function() {
     let skipE10sChecks = false;
     try {
       skipE10sChecks = (UpdateChannel.get() != "nightly") ||
                        Services.prefs.getBoolPref("browser.tabs.remote.autostart.disabled-because-using-a11y");