From bc38f3bfcb63bfcd23b1fdf99d6ae270cbba78e6 Mon Sep 17 00:00:00 2001
From: Cosmin Sabou <csabou@mozilla.com>
Date: Thu, 13 Sep 2018 22:29:45 +0300
Subject: [PATCH] Backed out changeset 2f15d5f434d8 (bug 1490891) for reftests
 and crashtest failures. CLOSED TREE

---
 gfx/thebes/gfxPrefs.h                         |  1 -
 gfx/webrender_bindings/Moz2DImageRenderer.cpp | 15 +++++++--------
 modules/libpref/init/all.js                   |  1 -
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index 3a3ef4e99b05..deb06e31fe5f 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -523,7 +523,6 @@ class gfxPrefs final
   DECL_GFX_PREF(Once, "gfx.webrender.all.qualified",           WebRenderAllQualified, bool, true);
   DECL_GFX_PREF(Live, "gfx.webrender.blob-images",             WebRenderBlobImages, bool, true);
   DECL_GFX_PREF(Live, "gfx.webrender.blob.invalidation",       WebRenderBlobInvalidation, bool, false);
-  DECL_GFX_PREF(Live, "gfx.webrender.blob.paint-flashing",     WebRenderBlobPaintFlashing, bool, false);
   DECL_GFX_PREF(Live, "gfx.webrender.dl.dump-parent",          WebRenderDLDumpParent, bool, false);
   DECL_GFX_PREF(Live, "gfx.webrender.dl.dump-content",         WebRenderDLDumpContent, bool, false);
   DECL_GFX_PREF(Once, "gfx.webrender.enabled",                 WebRenderEnabledDoNotUseDirectly, bool, false);
diff --git a/gfx/webrender_bindings/Moz2DImageRenderer.cpp b/gfx/webrender_bindings/Moz2DImageRenderer.cpp
index 44cf6785eeb0..53308d506ae2 100644
--- a/gfx/webrender_bindings/Moz2DImageRenderer.cpp
+++ b/gfx/webrender_bindings/Moz2DImageRenderer.cpp
@@ -4,7 +4,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "gfxPrefs.h"
 #include "gfxUtils.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/Range.h"
@@ -448,13 +447,13 @@ static bool Moz2DRenderCallback(const Range<const uint8_t> aBlob,
     offset = extra_end;
   }
 
-  if (gfxPrefs::WebRenderBlobPaintFlashing()) {
-    dt->SetTransform(gfx::Matrix());
-    float r = float(rand()) / RAND_MAX;
-    float g = float(rand()) / RAND_MAX;
-    float b = float(rand()) / RAND_MAX;
-    dt->FillRect(gfx::Rect(origin.x, origin.y, aSize.width, aSize.height), gfx::ColorPattern(gfx::Color(r, g, b, 0.5)));
-  }
+#if 0
+  dt->SetTransform(gfx::Matrix());
+  float r = float(rand()) / RAND_MAX;
+  float g = float(rand()) / RAND_MAX;
+  float b = float(rand()) / RAND_MAX;
+  dt->FillRect(gfx::Rect(0, 0, aSize.width, aSize.height), gfx::ColorPattern(gfx::Color(r, g, b, 0.5)));
+#endif
 
   if (aDirtyRect) {
     dt->PopClip();
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 48c26b550d15..0cb545d23425 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -906,7 +906,6 @@ pref("gfx.compositor.glcontext.opaque", false);
 pref("gfx.webrender.highlight-painted-layers", false);
 pref("gfx.webrender.blob-images", true);
 pref("gfx.webrender.blob.invalidation", true);
-pref("gfx.webrender.blob.paint-flashing", true);
 
 // WebRender debugging utilities.
 pref("gfx.webrender.debug.texture-cache", false);