Backed out 1 changesets (bug 1697195) for dt failures on nsDisplayLis…

…t.cpp. CLOSED TREE Backed out changeset d5ebf7eedb59 (bug 1697195)
dothq · Mar 9, 2021 · aaad782 · aaad782
1 parent 6fdd239
commit aaad782
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/gfx/config/gfxConfigManager.cpp b/gfx/config/gfxConfigManager.cpp
@@ -13,7 +13,6 @@
 #include "gfxConfig.h"
 #include "gfxPlatform.h"
 #include "nsIGfxInfo.h"
-#include "nsIXULRuntime.h"  // for FissionAutostart
 #include "nsPrintfCString.h"
 #include "nsXULAppAPI.h"
 
@@ -126,8 +125,6 @@ void gfxConfigManager::ConfigureWebRenderSoftware() {
   // (hardware). See bug 1656811.
   if (mWrSoftwareForceEnabled) {
     mFeatureWrSoftware->UserForceEnable("Force enabled by pref");
-  } else if (FissionAutostart()) {
-    mFeatureWrSoftware->UserForceEnable("Force enabled by fission");
   } else if (mWrForceDisabled || mWrEnvForceDisabled) {
     // If the user set the pref to force-disable, let's do that. This
     // will override all the other enabling prefs

diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
@@ -3359,8 +3359,7 @@ bool gfxPlatform::FallbackFromAcceleration(FeatureStatus aStatus,
     return true;
   }
 
-  if (StaticPrefs::gfx_webrender_fallback_basic_AtStartup() &&
-      !FissionAutostart()) {
+  if (StaticPrefs::gfx_webrender_fallback_basic_AtStartup()) {
     // Fallback from WebRender or Software WebRender to Basic.
     gfxCriticalNote << "Fallback (SW-)WR to Basic";
     if (gfxConfig::IsEnabled(Feature::WEBRENDER_SOFTWARE)) {

diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
@@ -152,7 +152,6 @@
 #include "mozilla/StaticPrefs_layout.h"
 
 #include "nsIGfxInfo.h"
-#include "nsIXULRuntime.h"  // for FissionAutostart
 #include "nsUXThemeConstants.h"
 #include "KeyboardLayout.h"
 #include "nsNativeDragTarget.h"
@@ -8540,9 +8539,8 @@ void nsWindow::PickerClosed() {
 }
 
 bool nsWindow::WidgetTypePrefersSoftwareWebRender() const {
-  return (mTransparencyMode == eTransparencyTransparent &&
-          (StaticPrefs::gfx_webrender_software_unaccelerated_widget_allow() ||
-           FissionAutostart())) ||
+  return (StaticPrefs::gfx_webrender_software_unaccelerated_widget_allow() &&
+          mTransparencyMode == eTransparencyTransparent) ||
          nsBaseWidget::WidgetTypePrefersSoftwareWebRender();
 }