Replace DCHECK with DCHECK_op and split some DCHECKs wherever necessary

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 85 matching lines @@
       m_pendingDelayedPaintInvalidations(
           parentState.m_pendingDelayedPaintInvalidations),
       m_paintingLayer(parentState.childPaintingLayer(currentObject))
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
       ,
       m_canCheckFastPathSlowPathEquality(
           parentState.m_canCheckFastPathSlowPathEquality)
 #endif
 {
   DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
-  DCHECK(&m_paintingLayer == currentObject.paintingLayer());
+  DCHECK_EQ(&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 DCHECK_IS_ON()
     m_didUpdateForChildren = parentState.m_didUpdateForChildren;
 #endif
@@ skipping 119 matching lines @@
     return *child.paintingLayer();
   return m_paintingLayer;
 }
 
 void PaintInvalidationState::updateForCurrentObject(
     const PaintInvalidationState& parentState) {
   if (!m_cachedOffsetsEnabled)
     return;
 
   if (m_currentObject.isLayoutView()) {
-    DCHECK(&parentState.m_currentObject ==
-           LayoutAPIShim::layoutObjectFrom(
-               toLayoutView(m_currentObject).frame()->ownerLayoutItem()));
+    DCHECK_EQ(&parentState.m_currentObject,
+              LayoutAPIShim::layoutObjectFrom(
+                  toLayoutView(m_currentObject).frame()->ownerLayoutItem()));
     m_paintOffset +=
         toLayoutBox(parentState.m_currentObject).contentBoxOffset();
     // a LayoutView paints with a defined size but a pixel-rounded offset.
     m_paintOffset = LayoutSize(roundedIntSize(m_paintOffset));
     return;
   }
 
   EPosition position = m_currentObject.styleRef().position();
 
   if (position == EPosition::kFixed) {
@@ skipping 169 matching lines @@
   if (m_currentObject.isText())
     return visualRectLocation;
 
   FloatPoint point;
   if (m_paintInvalidationContainer != &m_currentObject) {
     if (m_cachedOffsetsEnabled) {
       if (m_currentObject.isSVGChild())
         point = m_svgTransform.mapPoint(point);
       point += FloatPoint(m_paintOffset);
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
-      DCHECK(point ==
-             slowLocalOriginToAncestorPoint(
-                 m_currentObject, m_paintInvalidationContainer, FloatPoint()));
+      DCHECK_EQ(point, slowLocalOriginToAncestorPoint(
+                           m_currentObject, m_paintInvalidationContainer,
+                           FloatPoint()));
 #endif
     } else {
       point = slowLocalToAncestorPoint(
           m_currentObject, *m_paintInvalidationContainer, FloatPoint());
     }
   }
 
   PaintLayer::mapPointInPaintInvalidationContainerToBacking(
       *m_paintInvalidationContainer, point);
 
@@ skipping 111 matching lines @@
   clipRect.move(m_paintOffset);
   if (m_clipped) {
     m_clipRect.intersect(clipRect);
   } else {
     m_clipRect = clipRect;
     m_clipped = true;
   }
 }
 
 PaintLayer& PaintInvalidationState::paintingLayer() const {
-  DCHECK(&m_paintingLayer == m_currentObject.paintingLayer());
+  DCHECK_EQ(&m_paintingLayer, m_currentObject.paintingLayer());
   return m_paintingLayer;
 }
 
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
 
 static bool mayHaveBeenSaturated(LayoutUnit value) {
   // This is not accurate, just to avoid too big values.
   return value.abs() >= LayoutUnit::max() / 2;
 }
 
@@ skipping 54 matching lines @@
   forcedSubtreeInvalidationFlags =
       paintInvalidationState.m_forcedSubtreeInvalidationFlags;
   paintInvalidationContainer =
       &paintInvalidationState.paintInvalidationContainer();
   paintingLayer = &paintInvalidationState.paintingLayer();
 }
 
 void PaintInvalidatorContextAdapter::mapLocalRectToVisualRectInBacking(
     const LayoutObject& object,
     LayoutRect& rect) const {
-  DCHECK(&object == &m_paintInvalidationState.currentObject());
+  DCHECK_EQ(&object, &m_paintInvalidationState.currentObject());
   m_paintInvalidationState.mapLocalRectToVisualRectInBacking(rect);
 }
 
 }  // namespace blink