Make ifdefs consistent in WebKit/Source/core/

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 14 matching lines @@
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/layout/LayoutObject.h"
 
 #include "core/animation/ElementAnimations.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/ElementTraversal.h"
+#include "core/dom/Node.h"

[mstensho (USE GERRIT), 2016/11/30 10:00:13]

No need for this. It's quite evident that LayoutObject.h already includes this
somehow. See LayoutObject::isPseudoElement(), for instance.

[Alexander Alekseev, 2016/12/01 06:05:14]

Done.

 #include "core/dom/StyleChangeReason.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/TextAffinity.h"
 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 51 matching lines @@
 
 static bool gModifyLayoutTreeStructureAnyState = false;
 
 }  // namespace
 
 const LayoutUnit& caretWidth() {
   static LayoutUnit gCaretWidth(1);
   return gCaretWidth;
 }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 
 LayoutObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope(
     LayoutObject& layoutObject)
     : m_layoutObject(layoutObject),
       m_preexistingForbidden(m_layoutObject.isSetNeedsLayoutForbidden()) {
   m_layoutObject.setNeedsLayoutIsForbidden(true);
 }
 
 LayoutObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope() {
   m_layoutObject.setNeedsLayoutIsForbidden(m_preexistingForbidden);
 }
 #endif
 
 struct SameSizeAsLayoutObject : DisplayItemClient {
   virtual ~SameSizeAsLayoutObject() {}  // Allocate vtable pointer.
   void* pointers[5];
   Member<void*> members[1];
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   unsigned m_debugBitfields : 2;
 #endif
   unsigned m_bitfields;
   unsigned m_bitfields2;
   LayoutRect m_visualRect;
   LayoutPoint m_paintOffset;
   std::unique_ptr<void*> m_paintProperties;
 };
 
 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject),
@@ skipping 83 matching lines @@
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 LayoutObject::LayoutObject(Node* node)
     : m_style(nullptr),
       m_node(node),
       m_parent(nullptr),
       m_previous(nullptr),
       m_next(nullptr),
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
       m_hasAXObject(false),
       m_setNeedsLayoutForbidden(false),
 #endif
       m_bitfields(node) {
   InstanceCounters::incrementCounter(InstanceCounters::LayoutObjectCounter);
   if (m_node)
     frameView()->incrementLayoutObjectCount();
 }
 
 LayoutObject::~LayoutObject() {
@@ skipping 550 matching lines @@
     last = object;
     if (scheduleRelayout && objectIsRelayoutBoundary(last))
       break;
     object = container;
   }
 
   if (scheduleRelayout)
     last->scheduleRelayout();
 }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 void LayoutObject::checkBlockPositionedObjectsNeedLayout() {
   ASSERT(!needsLayout());
 
   if (isLayoutBlock())
     toLayoutBlock(this)->checkPositionedObjectsNeedLayout();
 }
 #endif
 
 void LayoutObject::setPreferredLogicalWidthsDirty(MarkingBehavior markParents) {
   m_bitfields.setPreferredLogicalWidthsDirty(true);
@@ skipping 2559 matching lines @@
 void LayoutObject::setMayNeedPaintInvalidationAnimatedBackgroundImage() {
   if (mayNeedPaintInvalidationAnimatedBackgroundImage())
     return;
   m_bitfields.setMayNeedPaintInvalidationAnimatedBackgroundImage(true);
   setMayNeedPaintInvalidation();
 }
 
 void LayoutObject::clearPaintInvalidationFlags() {
   // paintInvalidationStateIsDirty should be kept in sync with the
   // booleans that are cleared below.
-  ASSERT(!shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() ||
+#if DCHECK_IS_ON()
+  DCHECK(!shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() ||
          paintInvalidationStateIsDirty());
+#endif
   clearShouldDoFullPaintInvalidation();
   m_bitfields.setChildShouldCheckForPaintInvalidation(false);
   m_bitfields.setMayNeedPaintInvalidation(false);
   m_bitfields.setMayNeedPaintInvalidationSubtree(false);
   m_bitfields.setMayNeedPaintInvalidationAnimatedBackgroundImage(false);
   m_bitfields.setShouldInvalidateSelection(false);
   m_bitfields.setBackgroundChangedSinceLastPaintInvalidation(false);
 }
 
 bool LayoutObject::isAllowedToModifyLayoutTreeStructure(Document& document) {
@@ skipping 82 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