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 55fbed9fbc00a33663c6558e6306d5e554cf43ac..159518252575da20b3257004af1ee199d3184465 100644 |
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h |
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h |
@@ -207,11 +207,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(); |
@@ -298,10 +294,8 @@ private: |
typedef HashMap<int, int> RenderingContextMap; |
std::unique_ptr<JSONObject> layerTreeAsJSONInternal(LayerTreeFlags, RenderingContextMap&) const; |
-#if DCHECK_IS_ON() |
PassRefPtr<SkPicture> capturePicture(); |
void checkPaintUnderInvalidations(const SkPicture&); |
-#endif |
GraphicsLayerClient* m_client; |