Bug 1329752 - Don't enable e10s for XP users on ESR. r=jimm draft
authorFelipe Gomes <felipc@gmail.com>
Fri, 03 Feb 2017 16:25:30 -0200
changeset 470444 273613ef6e6a4f7dd0c4708d22f8081062e3ef5d
parent 470437 bf15d4078c2a6db7df37ab466d28a1e075c9eb4d
child 470445 6bed3ebbb041e033432f4c514406fcf8b8c830a9
push id44022
push userfelipc@gmail.com
push dateFri, 03 Feb 2017 18:26:21 +0000
reviewersjimm
bugs1329752
milestone54.0a1
Bug 1329752 - Don't enable e10s for XP users on ESR. r=jimm MozReview-Commit-ID: CD9wvSOIj0s
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4930,20 +4930,22 @@ MultiprocessBlockPolicy() {
     }
   }
 #endif
 
   /**
    * Avoids enabling e10s for Windows XP users on the release channel.
    */
 #if defined(XP_WIN)
-  if (Preferences::GetDefaultCString("app.update.channel").EqualsLiteral("release") &&
-      !IsVistaOrLater()) {
-    gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem;
-    return gMultiprocessBlockPolicy;
+  if (!IsVistaOrLater()) {
+    nsAdoptingCString channelName = Preferences::GetDefaultCString("app.update.channel");
+    if (channelName.EqualsLiteral("release") || channelName.EqualsLiteral("esr")) {
+      gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem;
+      return gMultiprocessBlockPolicy;
+    }
   }
 #endif // XP_WIN
 
   /*
    * None of the blocking policies matched, so e10s is allowed to run.
    * Cache the information and return 0, indicating success.
    */
   gMultiprocessBlockPolicy = 0;