Reland of land Compile under-invalidation checking in all builds

third_party/WebKit/Source/platform/graphics/paint/PaintController.h

Index: third_party/WebKit/Source/platform/graphics/paint/PaintController.h
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintController.h b/third_party/WebKit/Source/platform/graphics/paint/PaintController.h
index a003376d96745bbb41733766d4ad783fd9699756..d4fbb3dac56e7868839c0e098344c6d6f5a011c0 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintController.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintController.h
@@ -166,7 +166,7 @@ protected:
         , m_skippingCacheCount(0)
         , m_numCachedNewItems(0)
         , m_currentChunkIsFromCachedSubsequence(true)
-#if DCHECK_IS_ON()
+#ifndef NDEBUG
         , m_numSequentialMatches(0)
         , m_numOutOfOrderMatches(0)
         , m_numIndexedItems(0)
@@ -211,13 +211,11 @@ private:
     void generateChunkRasterInvalidationRects(PaintChunk& newChunk);
     void generateChunkRasterInvalidationRectsComparingOldChunk(PaintChunk& newChunk, const PaintChunk& oldChunk);
 
-#if DCHECK_IS_ON()
     // The following two methods are for checking under-invalidations
-    // (when RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled).
+    // (when RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled).
     void showUnderInvalidationError(const char* reason, const DisplayItem& newItem, const DisplayItem* oldItem) const;
     void checkUnderInvalidation();
     bool isCheckingUnderInvalidation() const { return m_underInvalidationCheckingEnd - m_underInvalidationCheckingBegin > 0; }
-#endif
 
     // The last complete paint artifact.
     // In SPv2, this includes paint chunks as well as display items.
@@ -267,13 +265,16 @@ private:
 
     DisplayItemClient::CacheGenerationOrInvalidationReason m_currentCacheGeneration;
 
-#if DCHECK_IS_ON()
+#ifndef NDEBUG
     int m_numSequentialMatches;
     int m_numOutOfOrderMatches;
     int m_numIndexedItems;
+#endif
 
+#if DCHECK_IS_ON()
     // This is used to check duplicated ids during createAndAppend().
     IndicesByClientMap m_newDisplayItemIndicesByClient;
+#endif
 
     // These are set in useCachedDrawingIfPossible() and useCachedSubsequenceIfPossible()
     // when we could use cached drawing or subsequence and under-invalidation checking is on,
@@ -287,7 +288,6 @@ private:
     // compositing folding.
     int m_skippedProbableUnderInvalidationCount;
     String m_underInvalidationMessagePrefix;
-#endif
 
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
     // A stack recording subsequence clients that are currently painting.