Bug 1333423 - multiProcessCompatible=false should always be honored. r=felipe a=lizzard
authorMichael Kaply <mozilla@kaply.com>
Tue, 24 Jan 2017 15:56:26 -0600
changeset 359433 b9774d8f19b2a939fe107a870208f62a18b9f572
parent 359432 fd175ff6d784a34352efba79f031949473c7d734
child 359434 cac8c9e7e0efdb615504f66ede2cffeddca348ee
push id1343
push userkwierso@gmail.com
push dateWed, 25 Jan 2017 00:27:16 +0000
treeherdermozilla-release@cac8c9e7e0ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe, lizzard
bugs1333423
milestone51.0.1
Bug 1333423 - multiProcessCompatible=false should always be honored. r=felipe a=lizzard
toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm
--- a/toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm
+++ b/toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm
@@ -1011,21 +1011,21 @@ Object.defineProperty(this, "isAddonPart
     }
 
     if (blocklist && blocklist.indexOf(aAddon.id) > -1) {
       return false;
     }
 
     let policy = RolloutPolicy[policyId];
 
+    if (aAddon.mpcOptedOut == true) {
+      return false;
+    }
+
     if (policy.alladdons) {
-      if (aAddon.mpcOptedOut == true) {
-        return false;
-      }
-
       return true;
     }
 
     if (policy.webextensions && aAddon.type == "webextension") {
       return true;
     }
 
     if (policy.mpc && aAddon.multiprocessCompatible) {