Reland of land Compile under-invalidation checking in all builds

third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
index bcb7bc8d207f3ebcb9c7cf010c2b08c7f3c2c9c7..924d4e4c704307ca061b710a22e06d2814025159 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
@@ -208,11 +208,7 @@ public:
     void setTracksPaintInvalidations(bool);
     bool isTrackingOrCheckingPaintInvalidations() const
     {
-#if DCHECK_IS_ON()
-        if (RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled())
-            return true;
-#endif
-        return m_isTrackingPaintInvalidations;
+        return RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled() || m_isTrackingPaintInvalidations;
     }
 
     void resetTrackedPaintInvalidations();
@@ -299,10 +295,8 @@ private:
     typedef HashMap<int, int> RenderingContextMap;
     std::unique_ptr<JSONObject> layerTreeAsJSONInternal(LayerTreeFlags, RenderingContextMap&) const;
 
-#if DCHECK_IS_ON()
     sk_sp<SkPicture> capturePicture();
     void checkPaintUnderInvalidations(const SkPicture&);
-#endif
 
     GraphicsLayerClient* m_client;