Bug 1613683 - Ship WebRender on Intel/AMD devices with small screens and a battery to beta. r=jrmuizel, a=RyanVM
authorAndrew Osmond <aosmond@mozilla.com>
Mon, 10 Feb 2020 20:27:12 +0000
changeset 575512 0fcfdcd3490c66bd02fea3b07c6cfd7e895a3cef
parent 575511 a4da5e8a7c9d14f6e0c498b6c4d14cddfe32acc5
child 575513 136906173300f9b5978c5c8a7897e1c02aa7269c
push id12676
push userryanvm@gmail.com
push dateTue, 11 Feb 2020 20:05:59 +0000
treeherdermozilla-beta@136906173300 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel, RyanVM
bugs1613683
milestone74.0
Bug 1613683 - Ship WebRender on Intel/AMD devices with small screens and a battery to beta. r=jrmuizel, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D62321
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2913,17 +2913,17 @@ static void UpdateWRQualificationForAMD(
     // for 1080p or smaller screens. For larger screens, it remains disabled by
     // default.
     const int64_t kMaxPixelsBattery = 1920 * 1200;  // WUXGA
     if (aScreenPixels <= 0) {
       aFeature.Disable(
           FeatureStatus::BlockedScreenUnknown, "Screen size unknown",
           NS_LITERAL_CSTRING("FEATURE_FAILURE_SCREEN_SIZE_UNKNOWN"));
     } else if (aScreenPixels <= kMaxPixelsBattery) {
-#    ifdef NIGHTLY_BUILD
+#    ifdef EARLY_BETA_OR_EARLIER
       // Battery and small screen, it should be on by default in nightly.
       *aOutGuardedByQualifiedPref = false;
 #    else
       aFeature.Disable(
           FeatureStatus::BlockedReleaseChannelBattery,
           "Release channel and battery",
           NS_LITERAL_CSTRING("FEATURE_FAILURE_RELEASE_CHANNEL_BATTERY"));
 #    endif  // !NIGHTLY_BUILD
@@ -3105,18 +3105,19 @@ static void UpdateWRQualificationForInte
   }
   if (aHasBattery) {
 #    ifndef XP_WIN
     // aHasBattery is only ever true on Windows, we don't check it on other
     // platforms.
     MOZ_ASSERT(false);
 #    endif
     if (aScreenPixels <= kMaxPixelsBattery) {
-#    ifdef NIGHTLY_BUILD
-      // Battery and small screen, it should be on by default in nightly.
+#    ifdef EARLY_BETA_OR_EARLIER
+      // Battery and small screen, it should be on by default in nightly and
+      // beta.
       *aOutGuardedByQualifiedPref = false;
 #    else
       aFeature.Disable(
           FeatureStatus::BlockedReleaseChannelBattery,
           "Release channel and battery",
           NS_LITERAL_CSTRING("FEATURE_FAILURE_RELEASE_CHANNEL_BATTERY"));
       return;
 #    endif  // !NIGHTLY_BUILD