Backed out changeset cc3f0de953e4 (bug 1512799) for marionette failures on test_pref_rollout_workaround.py. CLOSED TREE
authorBrindusan Cristian <cbrindusan@mozilla.com>
Mon, 10 Dec 2018 23:10:15 +0200
changeset 506845 4dfcb38d0df7bbf06ac356a2234bb0d1d759b58a
parent 506844 d86d874b8a5d2807e02cb981484c2fe5dfdd7a21
child 506846 03e66b4500ef286504be6478f36535b972458cb8
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1512799
milestone65.0a1
backs outcc3f0de953e41bc8ca8b098c31cd3cf2fe983529
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset cc3f0de953e4 (bug 1512799) for marionette failures on test_pref_rollout_workaround.py. CLOSED TREE
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2710,18 +2710,23 @@ void gfxPlatform::InitWebRenderConfig() 
 
     // gfx.webrender.enabled and gfx.webrender.all only work on nightly
 #ifdef NIGHTLY_BUILD
   } else if (prefEnabled) {
     featureWebRender.UserEnable("Force enabled by pref");
 #endif
 
     // gfx.webrender.all.qualified works on all channels
-  } else if (wrQualifiedAll && featureWebRenderQualified.IsEnabled()) {
-    featureWebRender.UserEnable("Qualified enabled by pref ");
+  } else if (wrQualifiedAll) {
+    if (featureWebRenderQualified.IsEnabled()) {
+      featureWebRender.UserEnable("Qualified enabled by pref ");
+    } else {
+      featureWebRender.ForceDisable(FeatureStatus::Blocked,
+                                    "Qualified enable blocked", failureId);
+    }
   }
 
   // If the user set the pref to force-disable, let's do that. This will
   // override all the other enabling prefs (gfx.webrender.enabled,
   // gfx.webrender.all, and gfx.webrender.all.qualified).
   if (gfxPrefs::WebRenderForceDisabled() || WebRenderEnvvarDisabled()) {
     featureWebRender.UserDisable(
         "User force-disabled WR",