Replace ENABLE(ASSERT) with DCHECK_IS_ON().

third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp

 // 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.
 
 #include "core/layout/PaintInvalidationState.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 30 matching lines @@
       m_clipped(false),
       m_clippedForAbsolutePosition(false),
       m_cachedOffsetsEnabled(true),
       m_cachedOffsetsForAbsolutePositionEnabled(true),
       m_paintInvalidationContainer(&layoutView.containerForPaintInvalidation()),
       m_paintInvalidationContainerForStackedContents(
           m_paintInvalidationContainer),
       m_containerForAbsolutePosition(layoutView),
       m_pendingDelayedPaintInvalidations(pendingDelayedPaintInvalidations),
       m_paintingLayer(*layoutView.layer())
-#if ENABLE(ASSERT)
-      ,
-      m_didUpdateForChildren(false)
-#endif
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
       ,
       m_canCheckFastPathSlowPathEquality(layoutView ==
                                          m_paintInvalidationContainer)
 #endif
 {
   DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
 
   if (!supportsCachedOffsets(layoutView)) {
     m_cachedOffsetsEnabled = false;
@@ skipping 27 matching lines @@
       m_paintInvalidationContainerForStackedContents(
           parentState.m_paintInvalidationContainerForStackedContents),
       m_containerForAbsolutePosition(
           currentObject.canContainAbsolutePositionObjects()
               ? currentObject
               : parentState.m_containerForAbsolutePosition),
       m_svgTransform(parentState.m_svgTransform),
       m_pendingDelayedPaintInvalidations(
           parentState.m_pendingDelayedPaintInvalidations),
       m_paintingLayer(parentState.childPaintingLayer(currentObject))
-#if ENABLE(ASSERT)
-      ,
-      m_didUpdateForChildren(false)
-#endif
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
       ,
       m_canCheckFastPathSlowPathEquality(
           parentState.m_canCheckFastPathSlowPathEquality)
 #endif
 {
   DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
   DCHECK(&m_paintingLayer == currentObject.paintingLayer());
 
   if (currentObject == parentState.m_currentObject) {
 // Sometimes we create a new PaintInvalidationState from parentState on the same
 // object (e.g. LayoutView, and the HorriblySlowRectMapping cases in
 // LayoutBlock::invalidatePaintOfSubtreesIfNeeded()).
 // TODO(wangxianzhu): Avoid this for
 // RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled().
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
     m_didUpdateForChildren = parentState.m_didUpdateForChildren;
 #endif
     return;
   }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   DCHECK(parentState.m_didUpdateForChildren);
 #endif
 
   if (currentObject.isPaintInvalidationContainer()) {
     m_paintInvalidationContainer = toLayoutBoxModelObject(&currentObject);
     if (currentObject.styleRef().isStackingContext())
       m_paintInvalidationContainerForStackedContents =
           toLayoutBoxModelObject(&currentObject);
   } else if (currentObject.isLayoutView()) {
     // m_paintInvalidationContainerForStackedContents is only for stacked
@@ skipping 168 matching lines @@
   if (m_currentObject.isBox())
     m_paintOffset += toLayoutBox(m_currentObject).locationOffset();
 
   if (m_currentObject.isInFlowPositioned() && m_currentObject.hasLayer())
     m_paintOffset += toLayoutBoxModelObject(m_currentObject)
                          .layer()
                          ->offsetForInFlowPosition();
 }
 
 void PaintInvalidationState::updateForChildren(PaintInvalidationReason reason) {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   DCHECK(!m_didUpdateForChildren);
   m_didUpdateForChildren = true;
 #endif
 
   switch (reason) {
     case PaintInvalidationDelayedFull:
       m_pendingDelayedPaintInvalidations.push_back(&m_currentObject);
       break;
     case PaintInvalidationSubtree:
       m_forcedSubtreeInvalidationFlags |=
@@ skipping 92 matching lines @@
   if (ancestor.isBox()) {
     const LayoutBox* box = toLayoutBox(&ancestor);
     if (box->hasOverflowClip())
       result.move(box->scrolledContentOffset());
   }
   return result;
 }
 
 LayoutPoint PaintInvalidationState::computeLocationInBacking(
     const LayoutPoint& visualRectLocation) const {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   DCHECK(!m_didUpdateForChildren);
 #endif
 
   // Use visual rect location for LayoutTexts because it suffices to check
   // visual rect change for layout caused invalidation.
   if (m_currentObject.isText())
     return visualRectLocation;
 
   FloatPoint point;
   if (m_paintInvalidationContainer != &m_currentObject) {
@@ skipping 12 matching lines @@
     }
   }
 
   PaintLayer::mapPointInPaintInvalidationContainerToBacking(
       *m_paintInvalidationContainer, point);
 
   return LayoutPoint(point);
 }
 
 LayoutRect PaintInvalidationState::computeVisualRectInBacking() const {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   DCHECK(!m_didUpdateForChildren);
 #endif
 
   if (m_currentObject.isSVGChild())
     return computeVisualRectInBackingForSVG();
 
   LayoutRect rect = m_currentObject.localVisualRect();
   mapLocalRectToPaintInvalidationBacking(rect);
   return rect;
 }
@@ skipping 39 matching lines @@
 
   if (object.isLayoutView())
     toLayoutView(object).mapToVisualRectInAncestorSpace(
         &ancestor, rect, InputIsInFrameCoordinates, DefaultVisualRectFlags);
   else
     object.mapToVisualRectInAncestorSpace(&ancestor, rect);
 }
 
 void PaintInvalidationState::mapLocalRectToPaintInvalidationContainer(
     LayoutRect& rect) const {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   DCHECK(!m_didUpdateForChildren);
 #endif
 
   if (m_cachedOffsetsEnabled) {
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
     LayoutRect slowPathRect(rect);
     slowMapToVisualRectInAncestorSpace(
         m_currentObject, *m_paintInvalidationContainer, slowPathRect);
 #endif
     rect.move(m_paintOffset);
@@ skipping 107 matching lines @@
 }
 
 void PaintInvalidatorContextAdapter::mapLocalRectToPaintInvalidationBacking(
     const LayoutObject& object,
     LayoutRect& rect) const {
   DCHECK(&object == &m_paintInvalidationState.currentObject());
   m_paintInvalidationState.mapLocalRectToPaintInvalidationBacking(rect);
 }
 
 }  // namespace blink