Bug 1275040 - Block e10s from being activated in OS X 10.6 - 10.8 in all channels. r=jimm, a=sledru
authorFelipe Gomes <felipc@gmail.com>
Wed, 25 May 2016 18:51:51 -0300
changeset 318962 acc1985e7895ab3d5c6053bc6682e20c1d41637d
parent 318961 f056a916bf8e280ad85f256147a51138fce9ecb1
child 318963 30ef13031f3b734e5db469a6c444bdb3eb67e8cb
push id9610
push userryanvm@gmail.com
push dateFri, 27 May 2016 14:45:39 +0000
treeherdermozilla-aurora@acc1985e7895 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm, sledru
bugs1275040
milestone48.0a2
Bug 1275040 - Block e10s from being activated in OS X 10.6 - 10.8 in all channels. r=jimm, a=sledru MozReview-Commit-ID: HOXJgZ4b10x
toolkit/content/aboutSupport.js
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -58,17 +58,17 @@ var snapshotFormatters = {
       case 6:
       case 7:
       case 8:
       case 9:
         statusText = stringBundle().GetStringFromName("multiProcessStatus." + data.autoStartStatus);
         break;
 
       case 10:
-        statusText = "Windows XP";
+        statusText = (Services.appinfo.OS == "Darwin" ? "OS X 10.6 - 10.8" : "Windows XP");
         break;
     }
 
     $("multiprocess-box").textContent = stringBundle().formatStringFromName("multiProcessWindows",
       [data.numRemoteWindows, data.numTotalWindows, statusText], 3);
 
     $("safemode-box").textContent = data.safeMode;
   },
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4760,16 +4760,27 @@ MultiprocessBlockPolicy() {
 #if defined(XP_WIN)
   if (Preferences::GetDefaultCString("app.update.channel").EqualsLiteral("release") &&
       !IsVistaOrLater()) {
     gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem;
     return gMultiprocessBlockPolicy;
   }
 #endif
 
+  /**
+   * Avoids enabling e10s for OS X 10.6 - 10.8 users (<= Lion) as these
+   * versions will be unsupported soon.
+   */
+#if defined(XP_MACOSX)
+  if (!nsCocoaFeatures::OnMountainLionOrLater()) {
+    gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem;
+    return gMultiprocessBlockPolicy;
+  }
+#endif
+
 #if defined(XP_WIN)
   /**
    * We block on Windows XP if layers acceleration is requested. This is due to
    * bug 1237769 where D3D9 and e10s behave badly together on XP.
    */
   bool layersAccelerationRequested = !Preferences::GetBool("layers.acceleration.disabled") ||
                                       Preferences::GetBool("layers.acceleration.force-enabled");