Revert of Reland Compile under-invalidation checking in all builds

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PaintController_h
 #define PaintController_h
 
 #include "platform/PlatformExport.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/IntRect.h"
@@ skipping 147 matching lines @@
 protected:
     PaintController()
         : m_newDisplayItemList(0)
         , m_constructionDisabled(false)
         , m_subsequenceCachingDisabled(false)
         , m_textPainted(false)
         , m_imagePainted(false)
         , m_skippingCacheCount(0)
         , m_numCachedNewItems(0)
         , m_currentChunkIsFromCachedSubsequence(true)
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
         , m_numSequentialMatches(0)
         , m_numOutOfOrderMatches(0)
         , m_numIndexedItems(0)
 #endif
     {
         resetCurrentListIndices();
     }
 
 private:
     friend class PaintControllerTestBase;
@@ skipping 24 matching lines @@
     void copyCachedSubsequence(size_t&);
 
     // Resets the indices (e.g. m_nextItemToMatch) of m_currentPaintArtifact.getDisplayItemList()
     // to their initial values. This should be called when the DisplayItemList in m_currentPaintArtifact
     // is newly created, or is changed causing the previous indices to be invalid.
     void resetCurrentListIndices();
 
     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::paintUnderInvalidationCheckingEnabled).
+    // (when RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled).
     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.
     PaintArtifact m_currentPaintArtifact;
 
     // Data being used to build the next paint artifact.
     DisplayItemList m_newDisplayItemList;
     PaintChunker m_newPaintChunks;
 
     // Allow display item construction to be disabled to isolate the costs of construction
@@ skipping 29 matching lines @@
     // Similar to m_outOfOrderItemIndices but
     // - the indices are chunk indices in m_currentPaintArtifacts.paintChunks();
     // - chunks are matched not only for requests of cached display items, but also non-cached display items.
     IndicesByClientMap m_outOfOrderChunkIndices;
 
     bool m_currentChunkIsFromCachedSubsequence;
     size_t m_nextChunkToMatch;
 
     DisplayItemClient::CacheGenerationOrInvalidationReason m_currentCacheGeneration;
 
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     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,
     // indicating the begin and end of the cached drawing or subsequence in the current list.
     // The functions return false to let the client do actual painting, and PaintController
     // will check if the actual painting results are the same as the cached.
     size_t m_underInvalidationCheckingBegin;
     size_t m_underInvalidationCheckingEnd;
     // Number of probable under-invalidations that have been skipped temporarily because the
     // mismatching display items may be removed in the future because of no-op pairs or
     // compositing folding.
     int m_skippedProbableUnderInvalidationCount;
     String m_underInvalidationMessagePrefix;
+#endif
 
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
     // A stack recording subsequence clients that are currently painting.
     Vector<const DisplayItemClient*> m_currentSubsequenceClients;
 #endif
 };
 
 } // namespace blink
 
 #endif // PaintController_h