Make ifdefs consistent in WebKit/Source/core/

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

Index: third_party/WebKit/Source/core/layout/LayoutObject.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h
index 8478f86e332c7f6041d231b7552db5f38e8c24dc..cb8a9290b3b75d2fd58108e018874e07104da9d4 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.h
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
@@ -292,7 +292,7 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
     return locateFlowThreadContainingBlock();
   }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   void setHasAXObject(bool flag) { m_hasAXObject = flag; }
   bool hasAXObject() const { return m_hasAXObject; }
 
@@ -322,12 +322,12 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   }
 
   void assertClearedPaintInvalidationFlags() const {
-#ifndef NDEBUG
     if (paintInvalidationStateIsDirty()) {
+#ifndef NDEBUG
       showLayoutTreeForThis();
+#endif
       ASSERT_NOT_REACHED();
     }
-#endif
   }
 
   void assertSubtreeClearedPaintInvalidationFlags() const {
@@ -419,7 +419,7 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
 
   //////////////////////////////////////////
  private:
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   bool isSetNeedsLayoutForbidden() const { return m_setNeedsLayoutForbidden; }
   void setNeedsLayoutIsForbidden(bool flag) {
     m_setNeedsLayoutForbidden = flag;
@@ -2039,7 +2039,7 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   void removeShapeImageClient(ShapeValue*);
   void removeCursorImageClient(const CursorList*);
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   void checkBlockPositionedObjectsNeedLayout();
 #endif
 
@@ -2065,7 +2065,7 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   LayoutObject* m_previous;
   LayoutObject* m_next;
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   unsigned m_hasAXObject : 1;
   unsigned m_setNeedsLayoutForbidden : 1;
 #endif
@@ -2520,7 +2520,7 @@ inline void LayoutObject::clearNeedsLayout() {
   setNeedsPositionedMovementLayout(false);
   setAncestorLineBoxDirty(false);
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
   checkBlockPositionedObjectsNeedLayout();
 #endif