Bug 1404098 - Don't disable multi for extensions. r=krizsa
authorBlake Kaplan <mrbkap@gmail.com>
Thu, 28 Sep 2017 15:22:05 -0700
changeset 383767 05864e4d5340080e248bee541d9079ef5133a5b8
parent 383766 cde998ffc14f8a14be13713f78625b182ee97b7c
child 383768 c8bcfa26b552945c397fde94e0b38c55ef5ec03f
push id32601
push userkwierso@gmail.com
push dateFri, 29 Sep 2017 21:45:53 +0000
treeherdermozilla-central@64c8107a2a13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskrizsa
bugs1404098
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1404098 - Don't disable multi for extensions. r=krizsa Now that the addons code will refuse to allow any non-webextension that hasn't been vetted to work with e10s-multi, we can allow all extensions in the rollout addon. MozReview-Commit-ID: L8RVJDTo7Ir
browser/extensions/e10srollout/bootstrap.js
browser/extensions/e10srollout/install.rdf.in
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -16,30 +16,27 @@ const TEST_THRESHOLD = {
   "beta": 0.9,  // 90%
   "release": 1.0,  // 100%
   "esr": 1.0,  // 100%
 };
 
 // If a user qualifies for the e10s-multi experiement, this is how many
 // content processes to use and whether to allow addons for the experiment.
 const MULTI_EXPERIMENT = {
-  "beta": { buckets: { 4: 1, }, // 4 processes: 100%
+  "beta": { buckets: { 4: 1 }, // 4 processes: 100%
 
-            // When on the "beta" channel, getAddonsDisqualifyForMulti
-            // will return true if any addon installed is not a web extension.
-            // Therefore, this returns true if and only if all addons
-            // installed are web extensions or if no addons are installed
-            // at all.
-            addonsDisableExperiment(prefix) { return getAddonsDisqualifyForMulti(); } },
+            // The extensions code only allows webextensions and legacy-style
+            // extensions that have been verified to work with multi.
+            // Therefore, we can allow all extensions.
+            addonsDisableExperiment(prefix) { return false; } },
 
   "release": { buckets: { 4: 1 }, // 4 processes: 100%
 
-               // See above for an explanation of this: we only allow users
-               // with no extensions or users with WebExtensions.
-               addonsDisableExperiment(prefix) { return getAddonsDisqualifyForMulti(); } }
+               // See the comment above the "beta" addonsDisableExperiment.
+               addonsDisableExperiment(prefix) { return false; } }
 };
 
 const ADDON_ROLLOUT_POLICY = {
   "beta": "50allmpc",
   "release": "50allmpc",
   "esr": "esrA", // WebExtensions and Addons with mpc=true
 };
 
--- a/browser/extensions/e10srollout/install.rdf.in
+++ b/browser/extensions/e10srollout/install.rdf.in
@@ -5,17 +5,17 @@
 
 #filter substitution
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>e10srollout@mozilla.org</em:id>
-    <em:version>3.00</em:version>
+    <em:version>3.05</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
 
     <!-- Target Application this theme can install into,
         with minimum and maximum supported versions. -->
     <em:targetApplication>
       <Description>