Bug 1477129: Part 3 - Re-enable e10s on FreeBSD. r?froydnj draft
authorKris Maglione <maglione.k@gmail.com>
Thu, 19 Jul 2018 18:18:27 -0700
changeset 821056 f1a41c910bdd5eb4ff739d931d782f8e41c5212e
parent 821055 557a4816957ee219f37cf8c60d58b45793bbe68f
child 821094 bf5b451a7b4c02754a5f7c00c698f02b9292391b
push id117002
push usermaglione.k@gmail.com
push dateFri, 20 Jul 2018 21:46:53 +0000
reviewersfroydnj
bugs1477129
milestone63.0a1
Bug 1477129: Part 3 - Re-enable e10s on FreeBSD. r?froydnj Backed out changeset 197fcba26a38 MozReview-Commit-ID: 4OOmP91hKXQ
toolkit/content/aboutSupport.js
toolkit/locales/en-US/chrome/global/aboutSupport.properties
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -55,18 +55,21 @@ var snapshotFormatters = {
     switch (data.autoStartStatus) {
       case 0:
       case 1:
       case 2:
       case 4:
       case 6:
       case 7:
       case 8:
+        statusText = strings.GetStringFromName("multiProcessStatus." + data.autoStartStatus);
+        break;
+
       case 10:
-        statusText = strings.GetStringFromName("multiProcessStatus." + data.autoStartStatus);
+        statusText = (Services.appinfo.OS == "Darwin" ? "OS X 10.6 - 10.8" : "Windows XP");
         break;
     }
 
     $("multiprocess-box").textContent = strings.formatStringFromName("multiProcessWindows",
       [data.numRemoteWindows, data.numTotalWindows, statusText], 3);
 
     if (data.remoteAutoStart) {
       $("contentprocesses-box").textContent = data.currentContentProcesses +
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -133,18 +133,18 @@ multiProcessWindows = %1$S/%2$S (%3$S)
 multiProcessStatus.0 = Enabled by user
 multiProcessStatus.1 = Enabled by default
 multiProcessStatus.2 = Disabled
 multiProcessStatus.4 = Disabled by accessibility tools
 multiProcessStatus.5 = Disabled by lack of graphics hardware acceleration on Mac OS X
 multiProcessStatus.6 = Disabled by unsupported text input
 multiProcessStatus.7 = Disabled by add-ons
 multiProcessStatus.8 = Disabled forcibly
+# No longer in use (bug 1296353) but we might bring this back.
 multiProcessStatus.9 = Disabled by graphics hardware acceleration on Windows XP
-multiProcessStatus.10 = Disabled by operating system bug
 multiProcessStatus.unknown = Unknown status
 
 asyncPanZoom = Asynchronous Pan/Zoom
 apzNone = none
 wheelEnabled = wheel input enabled
 touchEnabled = touch input enabled
 dragEnabled = scrollbar drag enabled
 keyboardEnabled = keyboard enabled
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -5150,17 +5150,17 @@ enum {
   kE10sDisabledByUser = 2,
   // kE10sDisabledInSafeMode = 3, was removed in bug 1172491.
   // kE10sDisabledForAccessibility = 4,
   // kE10sDisabledForMacGfx = 5, was removed in bug 1068674.
   // kE10sDisabledForBidi = 6, removed in bug 1309599
   // kE10sDisabledForAddons = 7, removed in bug 1406212
   kE10sForceDisabled = 8,
   // kE10sDisabledForXPAcceleration = 9, removed in bug 1296353
-  kE10sDisabledForOperatingSystem = 10,
+  // kE10sDisabledForOperatingSystem = 10, removed due to xp-eol
 };
 
 const char* kForceEnableE10sPref = "browser.tabs.remote.force-enable";
 const char* kForceDisableE10sPref = "browser.tabs.remote.force-disable";
 
 namespace mozilla {
 
 bool
@@ -5181,22 +5181,16 @@ BrowserTabsRemoteAutostart()
   int status = kE10sEnabledByDefault;
 
   if (optInPref) {
     gBrowserTabsRemoteAutostart = true;
   } else {
     status = kE10sDisabledByUser;
   }
 
-#if defined(__FreeBSD__)
-  // sendmsg() packet loss gotten worse, see bug 1475970
-  gBrowserTabsRemoteAutostart = false;
-  status = kE10sDisabledForOperatingSystem;
-#endif
-
   // Uber override pref for manual testing purposes
   if (Preferences::GetBool(kForceEnableE10sPref, false)) {
     gBrowserTabsRemoteAutostart = true;
     status = kE10sEnabledByUser;
   }
 
   // Uber override pref for emergency blocking
   if (gBrowserTabsRemoteAutostart &&