Replace ENABLE(ASSERT) with DCHECK_IS_ON().

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 2453 matching lines @@
 }
 
 bool CompositedLayerMapping::hasVisibleNonCompositingDescendant(
     PaintLayer* parent) {
   if (!parent->hasVisibleDescendant())
     return false;
 
   // FIXME: We shouldn't be called with a stale z-order lists. See bug 85512.
   parent->stackingNode()->updateLayerListsIfNeeded();
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   LayerListMutationDetector mutationChecker(parent->stackingNode());
 #endif
 
   PaintLayerStackingNodeIterator normalFlowIterator(*parent->stackingNode(),
                                                     AllChildren);
   while (PaintLayerStackingNode* curNode = normalFlowIterator.next()) {
     PaintLayer* curLayer = curNode->layer();
     if (curLayer->hasCompositedLayerMapping())
       continue;
     if (curLayer->hasVisibleContent() ||
@@ skipping 627 matching lines @@
     const GraphicsLayer* graphicsLayer,
     GraphicsContext& context,
     GraphicsLayerPaintingPhase graphicsLayerPaintingPhase,
     const IntRect& interestRect) const {
   // https://code.google.com/p/chromium/issues/detail?id=343772
   DisableCompositingQueryAsserts disabler;
   // Allow throttling to make sure no painting paths (e.g.,
   // ContentLayerDelegate::paintContents) try to paint throttled content.
   DocumentLifecycle::AllowThrottlingScope allowThrottling(
       m_owningLayer.layoutObject()->document().lifecycle());
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   // FIXME: once the state machine is ready, this can be removed and we can
   // refer to that instead.
   if (Page* page = layoutObject()->frame()->page())
     page->setIsPainting(true);
 #endif
 
   TRACE_EVENT1(
       "devtools.timeline,rail", "Paint", "data",
       InspectorPaintEvent::data(m_owningLayer.layoutObject(),
                                 LayoutRect(interestRect), graphicsLayer));
@@ skipping 57 matching lines @@
   } else if (graphicsLayer == m_squashingLayer.get()) {
     for (size_t i = 0; i < m_squashedLayers.size(); ++i)
       doPaintTask(m_squashedLayers[i], *graphicsLayer, paintLayerFlags, context,
                   interestRect);
   } else if (isScrollableAreaLayer(graphicsLayer)) {
     paintScrollableArea(graphicsLayer, context, interestRect);
   }
   InspectorInstrumentation::didPaint(m_owningLayer.layoutObject()->frame(),
                                      graphicsLayer, context,
                                      LayoutRect(interestRect));
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   if (Page* page = layoutObject()->frame()->page())
     page->setIsPainting(false);
 #endif
 }
 
 void CompositedLayerMapping::paintScrollableArea(
     const GraphicsLayer* graphicsLayer,
     GraphicsContext& context,
     const IntRect& interestRect) const {
   // Note the composited scrollable area painted here is never associated with a
@@ skipping 40 matching lines @@
   return graphicsLayer == layerForHorizontalScrollbar() ||
          graphicsLayer == layerForVerticalScrollbar() ||
          graphicsLayer == layerForScrollCorner();
 }
 
 bool CompositedLayerMapping::isTrackingRasterInvalidations() const {
   GraphicsLayerClient* client = compositor();
   return client ? client->isTrackingRasterInvalidations() : false;
 }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 void CompositedLayerMapping::verifyNotPainting() {
   ASSERT(!layoutObject()->frame()->page() ||
          !layoutObject()->frame()->page()->isPainting());
 }
 #endif
 
 // Only used for performance benchmark testing. Intended to be a
 // sufficiently-unique element id name to allow picking out the target element
 // for invalidation.
 static const char* kTestPaintInvalidationTargetName =
@@ skipping 86 matching lines @@
   }
 
   // Assert on incorrect mappings between layers and groups
   ASSERT(layerIndex < m_squashedLayers.size());
   if (layerIndex == m_squashedLayers.size())
     return;
 
   m_squashedLayers.remove(layerIndex);
 }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 bool CompositedLayerMapping::verifyLayerInSquashingVector(
     const PaintLayer* layer) {
   for (size_t layerIndex = 0; layerIndex < m_squashedLayers.size();
        ++layerIndex) {
     if (m_squashedLayers[layerIndex].paintLayer == layer)
       return true;
   }
 
   return false;
 }
@@ skipping 65 matching lines @@
   } else if (graphicsLayer == m_decorationOutlineLayer.get()) {
     name = "Decoration Layer";
   } else {
     ASSERT_NOT_REACHED();
   }
 
   return name;
 }
 
 }  // namespace blink