Backed out changeset 3714bd86365f (bug 1672489) for accidentally disabling wr on Win7.

CLOSED TREE

gfx/config/gfxConfigManager.cpp

@@ -347,14 +347,12 @@ void gfxConfigManager::ConfigureWebRender() {
                                  "FEATURE_FAILURE_DCOMP_PREF_DISABLED"_ns);
   }
 
-#ifndef NIGHTLY_BUILD
   if (!mIsWin10OrLater) {
     // XXX relax win version to windows 8.
     mFeatureWrDComp->Disable(FeatureStatus::Unavailable,
                              "Requires Windows 10 or later",
                              "FEATURE_FAILURE_DCOMP_NOT_WIN10"_ns);
   }
-#endif
 
   mFeatureWrDComp->MaybeSetFailed(
       mFeatureWr->IsEnabled(), FeatureStatus::Unavailable, "Requires WebRender",

gfx/tests/gtest/TestConfigManager.cpp

@@ -439,17 +439,9 @@ TEST_F(GfxConfigManager, WebRenderEarlierThanWindows10) {
 
   EXPECT_TRUE(mFeatures.mWrQualified.IsEnabled());
   EXPECT_TRUE(mFeatures.mWr.IsEnabled());
-#ifdef NIGHTLY_BUILD
-  EXPECT_TRUE(mFeatures.mWrCompositor.IsEnabled());
-#else
   EXPECT_FALSE(mFeatures.mWrCompositor.IsEnabled());
-#endif
   EXPECT_TRUE(mFeatures.mWrAngle.IsEnabled());
-#ifdef NIGHTLY_BUILD
-  EXPECT_TRUE(mFeatures.mWrDComp.IsEnabled());
-#else
   EXPECT_FALSE(mFeatures.mWrDComp.IsEnabled());
-#endif
   EXPECT_TRUE(mFeatures.mWrPartial.IsEnabled());
   EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());
   EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());