Allow assertions to be enabled in Blink Release builds.

Source/core/rendering/InlineFlowBox.h

Index: Source/core/rendering/InlineFlowBox.h
diff --git a/Source/core/rendering/InlineFlowBox.h b/Source/core/rendering/InlineFlowBox.h
index 986b84f37fc1debe677245c2ddb47025443454dd..b58014075db56978ef987473a31f5ab882987852 100644
--- a/Source/core/rendering/InlineFlowBox.h
+++ b/Source/core/rendering/InlineFlowBox.h
@@ -56,7 +56,7 @@ public:
         , m_lineBreakBidiStatusEor(WTF::Unicode::LeftToRight)
         , m_lineBreakBidiStatusLastStrong(WTF::Unicode::LeftToRight)
         , m_lineBreakBidiStatusLast(WTF::Unicode::LeftToRight)
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
         , m_hasBadChildList(false)
 #endif
     {
@@ -69,9 +69,11 @@ public:
         m_hasTextDescendants = m_hasTextChildren;
     }
 
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     virtual ~InlineFlowBox();
+#endif

[abarth-chromium, 2014/07/17 21:02:41]

This change looks incorrect.  We should be able to build debug without asserts.

[Ken Russell (switch to Gerrit), 2014/07/17 21:25:24]

It's correct. The base class defines the virtual destructor. This one only
overrides it in order to do assertions against data members conditionally
included with ENABLE(ASSERT). I verified with a local debug build forcing
ENABLE_ASSERT=0. There's one other build problem with that configuration and in
general I realized we can't set ENABLE_ASSERT from GYP because GYP files can't
test the flavor being built (i.e., Debug vs. Release).

 
+#ifndef NDEBUG
     virtual void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0, int = 0) const OVERRIDE;
     virtual const char* boxName() const OVERRIDE;
 #endif
@@ -351,7 +353,7 @@ protected:
 
     // End of RootInlineBox-specific members.
 
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
 private:
     unsigned m_hasBadChildList : 1;
 #endif
@@ -359,7 +361,7 @@ private:
 
 DEFINE_INLINE_BOX_TYPE_CASTS(InlineFlowBox);
 
-#ifdef NDEBUG
+#if !ENABLE(ASSERT)
 inline void InlineFlowBox::checkConsistency() const
 {
 }
@@ -367,7 +369,7 @@ inline void InlineFlowBox::checkConsistency() const
 
 inline void InlineFlowBox::setHasBadChildList()
 {
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     m_hasBadChildList = true;
 #endif
 }