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

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 1234 matching lines @@
   // Remove or update this code. crbug.com/460596
   TRACE_EVENT_END1("devtools.timeline", "Layout", "endData",
                    InspectorLayoutEvent::endData(rootForThisLayout));
   InspectorInstrumentation::didUpdateLayout(m_frame.get());
   PerformanceMonitor::didUpdateLayout(document);
 
   m_nestedLayoutCount--;
   if (m_nestedLayoutCount)
     return;
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   // Post-layout assert that nobody was re-marked as needing layout during
   // layout.
   layoutView()->assertSubtreeIsLaidOut();
 #endif
 
   frame().document()->layoutUpdated();
   checkDoesNotNeedLayout();
 }
 
 void FrameView::invalidateTreeIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
 
   if (shouldThrottleRendering())
     return;
 
   lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation);
 
   RELEASE_ASSERT(!layoutViewItem().isNull());
   LayoutViewItem rootForPaintInvalidation = layoutViewItem();
   ASSERT(!rootForPaintInvalidation.needsLayout());
 
   TRACE_EVENT1("blink", "FrameView::invalidateTree", "root",
                rootForPaintInvalidation.debugName().ascii());
 
   invalidatePaintIfNeeded(paintInvalidationState);
   rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState);
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   layoutView()->assertSubtreeClearedPaintInvalidationFlags();
 #endif
 
   lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean);
 }
 
 void FrameView::invalidatePaintIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   RELEASE_ASSERT(!layoutViewItem().isNull());
   if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
@@ skipping 1804 matching lines @@
     if (FrameView* view = toLocalFrame(child)->view())
       frameViews.append(view);
   }
 
   for (const auto& frameView : frameViews)
     frameView->updateStyleAndLayoutIfNeededRecursiveInternal();
 
   // These asserts ensure that parent frames are clean, when child frames
   // finished updating layout and style.
   checkDoesNotNeedLayout();
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   m_frame->document()->layoutView()->assertLaidOut();
 #endif
 
   updateWidgetGeometriesIfNeeded();
 
   if (lifecycle().state() < DocumentLifecycle::LayoutClean)
     lifecycle().advanceTo(DocumentLifecycle::LayoutClean);
 
   // Ensure that we become visually non-empty eventually.
   // TODO(esprehn): This should check isRenderingReady() instead.
@@ skipping 1536 matching lines @@
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.width();
 }
 
 int FrameView::initialViewportHeight() const {
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.height();
 }
 
 }  // namespace blink