Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(496)

Unified Diff: third_party/WebKit/Source/platform/graphics/paint/PaintController.h

Issue 2306783002: Revert of Compile under-invalidation checking in all builds (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b9c2f617b00628329ca95f98512530ba9dc7719b..bb36aee57305ce5d14b5543b896b9a42c2db2f93 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintController.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintController.h
@@ -165,7 +165,7 @@
, m_skippingCacheCount(0)
, m_numCachedNewItems(0)
, m_currentChunkIsFromCachedSubsequence(true)
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
, m_numSequentialMatches(0)
, m_numOutOfOrderMatches(0)
, m_numIndexedItems(0)
@@ -210,11 +210,13 @@
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.
@@ -264,16 +266,13 @@
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,
@@ -287,6 +286,7 @@
// compositing folding.
int m_skippedProbableUnderInvalidationCount;
String m_underInvalidationMessagePrefix;
+#endif
#if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
// A stack recording subsequence clients that are currently painting.

Powered by Google App Engine
This is Rietveld 408576698