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 377934 99104f0554c30a6fa277bf44a47e6179e336b4f9
parent 377933 c81058f0cbf8889eddd04058f9636e021eb43368
child 377935 9e940073dc847cb291eeadf2dd069fcdc258b682
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe, lizzard
bugs1333423
milestone53.0a2
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
@@ -933,21 +933,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) {