From 07727ed2476ec8a4a0045a3eeaba2bb17cc1c027 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 19 Jul 2018 18:18:27 -0700
Subject: [PATCH] Bug 1477129: Part 3 - Re-enable e10s on FreeBSD. r=froydnj

Backed out changeset 197fcba26a38

MozReview-Commit-ID: 4OOmP91hKXQ

--HG--
extra : rebase_source : 92d3e01734c6154261a8003fcc481c9d81f00c38
---
 toolkit/content/aboutSupport.js                           | 5 ++++-
 .../locales/en-US/chrome/global/aboutSupport.properties   | 2 +-
 toolkit/xre/nsAppRunner.cpp                               | 8 +-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 3c44097d2029..35a40f0344bd 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -60,9 +60,12 @@ var snapshotFormatters = {
       case 6:
       case 7:
       case 8:
-      case 10:
         statusText = strings.GetStringFromName("multiProcessStatus." + data.autoStartStatus);
         break;
+
+      case 10:
+        statusText = (Services.appinfo.OS == "Darwin" ? "OS X 10.6 - 10.8" : "Windows XP");
+        break;
     }
 
     $("multiprocess-box").textContent = strings.formatStringFromName("multiProcessWindows",
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
index c04743a3e339..96b8f9660ca8 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -138,8 +138,8 @@ multiProcessStatus.5 = Disabled by lack of graphics hardware acceleration on Mac
 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
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 1f45bdad38a8..9630ead3b123 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -5155,7 +5155,7 @@ enum {
   // 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";
@@ -5186,12 +5186,6 @@ BrowserTabsRemoteAutostart()
     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;