Make ifdefs consistent in WebKit/Source/core/paint/ .

third_party/WebKit/Source/core/paint/FramePainter.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/paint/FramePainter.h"
 
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/frame/FrameView.h"
 #include "core/inspector/InspectorInstrumentation.h"
@@ skipping 148 matching lines @@
 
   // TODO(jchaffraix): GlobalPaintFlags should be const during a paint
   // phase. Thus we should set this flag upfront (crbug.com/510280).
   GlobalPaintFlags localPaintFlags = globalPaintFlags;
   if (document->printing())
     localPaintFlags |=
         GlobalPaintFlattenCompositingLayers | GlobalPaintPrinting;
 
   PaintLayer* rootLayer = layoutView->layer();
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   layoutView->assertSubtreeIsLaidOut();
   LayoutObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(
       *rootLayer->layoutObject());
 #endif
 
   PaintLayerPainter layerPainter(*rootLayer);
 
   float deviceScaleFactor =
       blink::deviceScaleFactor(rootLayer->layoutObject()->frame());
   context.setDeviceScaleFactor(deviceScaleFactor);
@@ skipping 71 matching lines @@
 
   bar.paint(context, CullRect(rect));
 }
 
 const FrameView& FramePainter::frameView() {
   DCHECK(m_frameView);
   return *m_frameView;
 }
 
 }  // namespace blink