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

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2484 matching lines @@
   return isBeforeContent() || isAfterContent();
 }
 
 // setNeedsLayout() won't cause full paint invalidations as
 // setNeedsLayoutAndFullPaintInvalidation() does. Otherwise the two methods are
 // identical.
 inline void LayoutObject::setNeedsLayout(
     LayoutInvalidationReasonForTracing reason,
     MarkingBehavior markParents,
     SubtreeLayoutScope* layouter) {
-  ASSERT(!isSetNeedsLayoutForbidden());
+#if DCHECK_IS_ON()
+  DCHECK(!isSetNeedsLayoutForbidden());
+#endif
   bool alreadyNeededLayout = m_bitfields.selfNeedsLayout();
   setSelfNeedsLayout(true);
   if (!alreadyNeededLayout) {
     TRACE_EVENT_INSTANT1(
         TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"),
         "LayoutInvalidationTracking", TRACE_EVENT_SCOPE_THREAD, "data",
         InspectorLayoutInvalidationTrackingEvent::data(this, reason));
     if (markParents == MarkContainerChain &&
         (!layouter || layouter->root() != this))
       markContainerChainForLayout(!layouter, layouter);
@@ skipping 23 matching lines @@
 
 #if DCHECK_IS_ON()
   checkBlockPositionedObjectsNeedLayout();
 #endif
 
   setScrollAnchorDisablingStyleChanged(false);
 }
 
 inline void LayoutObject::setChildNeedsLayout(MarkingBehavior markParents,
                                               SubtreeLayoutScope* layouter) {
-  ASSERT(!isSetNeedsLayoutForbidden());
+#if DCHECK_IS_ON()
+  DCHECK(!isSetNeedsLayoutForbidden());
+#endif
   bool alreadyNeededLayout = normalChildNeedsLayout();
   setNormalChildNeedsLayout(true);
   // FIXME: Replace MarkOnlyThis with the SubtreeLayoutScope code path and
   // remove the MarkingBehavior argument entirely.
   if (!alreadyNeededLayout && markParents == MarkContainerChain &&
       (!layouter || layouter->root() != this))
     markContainerChainForLayout(!layouter, layouter);
 }
 
 inline void LayoutObject::setNeedsPositionedMovementLayout() {
   bool alreadyNeededLayout = needsPositionedMovementLayout();
   setNeedsPositionedMovementLayout(true);
+#if DCHECK_IS_ON()
   ASSERT(!isSetNeedsLayoutForbidden());

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

DCHECK

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

Done.

+#endif
   if (!alreadyNeededLayout)
     markContainerChainForLayout();
 }
 
 inline bool LayoutObject::preservesNewline() const {
   if (isSVGInlineText())
     return false;
 
   return style()->preserveNewline();
 }
@@ skipping 89 matching lines @@
 CORE_EXPORT void showLineTree(const blink::LayoutObject*);
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1);
 // We don't make object2 an optional parameter so that showLayoutTree
 // can be called from gdb easily.
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1,
                                 const blink::LayoutObject* object2);
 
 #endif
 
 #endif  // LayoutObject_h