Bug 1296353 - Enable e10s with accelerated gfx for XP Users. r=felipe

MozReview-Commit-ID: 2VHpBAVbiQ0

--HG--
extra : rebase_source : a568b41b0d62ed71b9220774e2ab5d35ee78ef45

toolkit/content/aboutSupport.js

@@ -60,7 +60,6 @@ var snapshotFormatters = {
       case 6:
       case 7:
       case 8:
-      case 9:
         statusText = stringBundle().GetStringFromName("multiProcessStatus." + data.autoStartStatus);
         break;
 

toolkit/locales/en-US/chrome/global/aboutSupport.properties

@@ -111,6 +111,7 @@ 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.unknown = Unknown status
 

toolkit/xre/nsAppRunner.cpp

@@ -4650,7 +4650,7 @@ enum {
   kE10sDisabledForBidi = 6,
   kE10sDisabledForAddons = 7,
   kE10sForceDisabled = 8,
-  kE10sDisabledForXPAcceleration = 9,
+  // kE10sDisabledForXPAcceleration = 9, removed in bug 1296353
   kE10sDisabledForOperatingSystem = 10,
 };
 
@@ -4742,18 +4742,6 @@ MultiprocessBlockPolicy() {
     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)