Bug 1275040 - Block e10s from being activated in OS X 10.6 - 10.8 in all channels. r=jimm
authorFelipe Gomes <felipc@gmail.com>
Wed, 25 May 2016 18:51:51 -0300
changeset 338076 94bc94b961768538296b30ef704f99fcfe9d5874
parent 338075 e3977905475d792781a2c8b3231fb5eb1bcca582
child 338077 9ef45b3ae61d40b772319a314205ddacfe00cff9
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1275040
milestone49.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 1275040 - Block e10s from being activated in OS X 10.6 - 10.8 in all channels. r=jimm MozReview-Commit-ID: HOXJgZ4b10x
toolkit/content/aboutSupport.js
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -60,17 +60,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
@@ -4787,16 +4787,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");