|
 |
5b8da38 |
diff -up firefox-53.0/browser/extensions/e10srollout/bootstrap.js.1348576 firefox-53.0/browser/extensions/e10srollout/bootstrap.js
|
|
|
5b8da38 |
--- firefox-53.0/browser/extensions/e10srollout/bootstrap.js.1348576 2017-04-18 13:06:29.660860929 +0200
|
|
|
5b8da38 |
+++ firefox-53.0/browser/extensions/e10srollout/bootstrap.js 2017-04-18 13:07:34.804627469 +0200
|
|
|
5b8da38 |
@@ -9,6 +9,7 @@ const {classes: Cc, interfaces: Ci, util
|
|
|
5b8da38 |
Cu.import("resource://gre/modules/Preferences.jsm");
|
|
|
5b8da38 |
Cu.import("resource://gre/modules/Services.jsm");
|
|
|
5b8da38 |
Cu.import("resource://gre/modules/UpdateUtils.jsm");
|
|
|
5b8da38 |
+Cu.import("resource://gre/modules/AppConstants.jsm");
|
|
|
5b8da38 |
|
|
|
5b8da38 |
// The amount of people to be part of e10s
|
|
|
5b8da38 |
const TEST_THRESHOLD = {
|
|
|
5b8da38 |
@@ -23,6 +24,23 @@ const ADDON_ROLLOUT_POLICY = {
|
|
|
5b8da38 |
"esr" : "esrA", // WebExtensions and Addons with mpc=true
|
|
|
5b8da38 |
};
|
|
|
5b8da38 |
|
|
|
5b8da38 |
+if (AppConstants.RELEASE_OR_BETA) {
|
|
|
5b8da38 |
+ // Bug 1348576 - e10s is never enabled for non-official release builds
|
|
|
5b8da38 |
+ // This is hacky, but the problem it solves is the following:
|
|
|
5b8da38 |
+ // the e10s rollout is controlled by the channel name, which
|
|
|
5b8da38 |
+ // is the only way to distinguish between Beta and Release.
|
|
|
5b8da38 |
+ // However, non-official release builds (like the ones done by distros
|
|
|
5b8da38 |
+ // to ship Firefox on their package managers) do not set a value
|
|
|
5b8da38 |
+ // for the release channel, which gets them to the default value
|
|
|
5b8da38 |
+ // of.. (drumroll) "default".
|
|
|
5b8da38 |
+ // But we can't just always configure the same settings for the
|
|
|
5b8da38 |
+ // "default" channel because that's also the name that a locally
|
|
|
5b8da38 |
+ // built Firefox gets, and e10s is managed in a different way
|
|
|
5b8da38 |
+ // there (directly by prefs, on Nightly and Aurora).
|
|
|
5b8da38 |
+ TEST_THRESHOLD.default = TEST_THRESHOLD.release;
|
|
|
5b8da38 |
+ ADDON_ROLLOUT_POLICY.default = ADDON_ROLLOUT_POLICY.release;
|
|
|
5b8da38 |
+}
|
|
|
5b8da38 |
+
|
|
|
5b8da38 |
const PREF_COHORT_SAMPLE = "e10s.rollout.cohortSample";
|
|
|
5b8da38 |
const PREF_COHORT_NAME = "e10s.rollout.cohort";
|
|
|
5b8da38 |
const PREF_E10S_OPTED_IN = "browser.tabs.remote.autostart";
|
|
|
5b8da38 |
diff -up firefox-53.0/browser/extensions/e10srollout/install.rdf.in.1348576 firefox-53.0/browser/extensions/e10srollout/install.rdf.in
|
|
|
5b8da38 |
--- firefox-53.0/browser/extensions/e10srollout/install.rdf.in.1348576 2017-04-11 06:15:16.000000000 +0200
|
|
|
5b8da38 |
+++ firefox-53.0/browser/extensions/e10srollout/install.rdf.in 2017-04-18 13:06:29.660860929 +0200
|
|
|
5b8da38 |
@@ -10,7 +10,7 @@
|
|
|
5b8da38 |
|
|
|
5b8da38 |
<Description about="urn:mozilla:install-manifest">
|
|
|
5b8da38 |
<em:id>e10srollout@mozilla.org</em:id>
|
|
|
5b8da38 |
- <em:version>1.14</em:version>
|
|
|
5b8da38 |
+ <em:version>1.15</em:version>
|
|
|
5b8da38 |
<em:type>2</em:type>
|
|
|
5b8da38 |
<em:bootstrap>true</em:bootstrap>
|
|
|
5b8da38 |
<em:multiprocessCompatible>true</em:multiprocessCompatible>
|