Bug 1296353 - Enable e10s with accelerated gfx for XP Users. r=felipe
authorJim Mathies <jmathies@mozilla.com>
Thu, 01 Sep 2016 14:28:04 -0500
changeset 312417 f2407e891aad4fdac57417e1ed3c95f3cc75eefd
parent 312416 c4fb41365df3259c6d43b6b897c4aebfc93a08d9
child 312418 246d2a65316a70192506abcecb78ef1a4e6e0ff5
push id20447
push userkwierso@gmail.com
push dateFri, 02 Sep 2016 20:36:44 +0000
treeherderfx-team@969397f22187 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe
bugs1296353
milestone51.0a1
Bug 1296353 - Enable e10s with accelerated gfx for XP Users. r=felipe MozReview-Commit-ID: 2VHpBAVbiQ0
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,17 +55,16 @@ var snapshotFormatters = {
     switch (data.autoStartStatus) {
       case 0:
       case 1:
       case 2:
       case 4:
       case 6:
       case 7:
       case 8:
-      case 9:
         statusText = stringBundle().GetStringFromName("multiProcessStatus." + data.autoStartStatus);
         break;
 
       case 10:
         statusText = (Services.appinfo.OS == "Darwin" ? "OS X 10.6 - 10.8" : "Windows XP");
         break;
     }
 
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -106,16 +106,17 @@ 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.unknown = Unknown status
 
 asyncPanZoom = Asynchronous Pan/Zoom
 apzNone = none
 wheelEnabled = wheel input enabled
 touchEnabled = touch input enabled
 dragEnabled = scrollbar drag enabled
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4645,17 +4645,17 @@ enum {
   kE10sEnabledByDefault = 1,
   kE10sDisabledByUser = 2,
   // kE10sDisabledInSafeMode = 3, was removed in bug 1172491.
   kE10sDisabledForAccessibility = 4,
   // kE10sDisabledForMacGfx = 5, was removed in bug 1068674.
   kE10sDisabledForBidi = 6,
   kE10sDisabledForAddons = 7,
   kE10sForceDisabled = 8,
-  kE10sDisabledForXPAcceleration = 9,
+  // kE10sDisabledForXPAcceleration = 9, removed in bug 1296353
   kE10sDisabledForOperatingSystem = 10,
 };
 
 const char* kAccessibilityLastRunDatePref = "accessibility.lastLoadDate";
 const char* kAccessibilityLoadedLastSessionPref = "accessibility.loadedInLastSession";
 
 static inline uint32_t
 PRTimeToSeconds(PRTime t_usec)
@@ -4737,28 +4737,16 @@ MultiprocessBlockPolicy() {
    * 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;
   }
-
-  /**
-   * 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");
-
-  if (layersAccelerationRequested && !IsVistaOrLater()) {
-    gMultiprocessBlockPolicy = kE10sDisabledForXPAcceleration;
-    return gMultiprocessBlockPolicy;
-  }
 #endif // XP_WIN
 
 #if defined(MOZ_WIDGET_GTK)
   /**
    * Avoids enabling e10s for certain locales that require bidi selection,
    * which currently doesn't work well with e10s.
    */
   bool disabledForBidi = false;