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 bb36aee57305ce5d14b5543b896b9a42c2db2f93..3a0862609c0c3d43a257653ec5523b7015506f45 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 @@ 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) |
@@ -210,13 +210,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). |
pdr.
2016/09/01 16:48:52
Nit: paintUnderInvalidationCheckingEnabled
Xianzhu
2016/09/01 17:00:03
Done.
|
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. |
@@ -266,13 +264,16 @@ private: |
DisplayItemClient::CacheGenerationOrInvalidationReason m_currentCacheGeneration; |
-#if DCHECK_IS_ON() |
+#ifndef NDEBUG |
pdr.
2016/09/01 16:48:52
Why did this change to ndebug? (here, and elsewher
Xianzhu
2016/09/01 17:00:03
They are really for debugging, not for checking an
|
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, |
@@ -286,7 +287,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. |