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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  *               (http://www.torchmobile.com/)
@@ skipping 218 matching lines @@
       m_hasAXObject(false),
       m_setNeedsLayoutForbidden(false),
 #endif
       m_bitfields(node) {
   InstanceCounters::incrementCounter(InstanceCounters::LayoutObjectCounter);
   if (m_node)
     frameView()->incrementLayoutObjectCount();
 }
 
 LayoutObject::~LayoutObject() {
-  ASSERT(!m_hasAXObject);
+#if DCHECK_IS_ON()
+  DCHECK(!m_hasAXObject);
+#endif
   InstanceCounters::decrementCounter(InstanceCounters::LayoutObjectCounter);
 }
 
 bool LayoutObject::isDescendantOf(const LayoutObject* obj) const {
   for (const LayoutObject* r = this; r; r = r->m_parent) {
     if (r == obj)
       return true;
   }
   return false;
 }
@@ skipping 480 matching lines @@
   // heights (and the number of rows). Instead of identifying cases where it's
   // safe to allow relayout roots, just disallow them inside multicol.
   if (object->isInsideFlowThread())
     return false;
 
   return true;
 }
 
 void LayoutObject::markContainerChainForLayout(bool scheduleRelayout,
                                                SubtreeLayoutScope* layouter) {
-  ASSERT(!isSetNeedsLayoutForbidden());
+#if DCHECK_IS_ON()
+  DCHECK(!isSetNeedsLayoutForbidden());
+#endif
   ASSERT(!layouter || this != layouter->root());
   // When we're in layout, we're marking a descendant as needing layout with
   // the intention of visiting it during this layout. We shouldn't be
   // scheduling it to be laid out later. Also, scheduleRelayout() must not be
   // called while iterating FrameView::m_layoutSubtreeRootList.
   scheduleRelayout &= !frameView()->isInPerformLayout();
 
   LayoutObject* object = container();
   LayoutObject* last = this;
 
@@ skipping 10 matching lines @@
     LayoutObject* container = object->container();
     if (!container && !object->isLayoutView())
       return;
     if (!last->isTextOrSVGChild() && last->style()->hasOutOfFlowPosition()) {
       object = last->containingBlock();
       if (object->posChildNeedsLayout())
         return;
       container = object->container();
       object->setPosChildNeedsLayout(true);
       simplifiedNormalFlowLayout = true;
-      ASSERT(!object->isSetNeedsLayoutForbidden());
+#if DCHECK_IS_ON()
+      DCHECK(!object->isSetNeedsLayoutForbidden());
+#endif
     } else if (simplifiedNormalFlowLayout) {
       if (object->needsSimplifiedNormalFlowLayout())
         return;
       object->setNeedsSimplifiedNormalFlowLayout(true);
-      ASSERT(!object->isSetNeedsLayoutForbidden());
+#if DCHECK_IS_ON()
+      DCHECK(!object->isSetNeedsLayoutForbidden());
+#endif
     } else {
       if (object->normalChildNeedsLayout())
         return;
       object->setNormalChildNeedsLayout(true);
+#if DCHECK_IS_ON()
       ASSERT(!object->isSetNeedsLayoutForbidden());

[mstensho (USE GERRIT), 2016/12/06 09:58:46]

DCHECK.

Looks like this would look prettier if you replace the three DCHECKs with one
DCHECK after the if-else blocks, since they all perform this.

[Alexander Alekseev, 2016/12/06 10:13:30]

Done.

+#endif
     }
 
     if (layouter) {
       layouter->recordObjectMarkedForLayout(object);
       if (object == layouter->root())
         return;
     }
 
     last = object;
     if (scheduleRelayout && objectIsRelayoutBoundary(last))
@@ skipping 2709 matching lines @@
     const blink::LayoutObject* root = object1;
     while (root->parent())
       root = root->parent();
     root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
   } else {
     WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
   }
 }
 
 #endif