Allow assertions to be enabled in Blink Release builds.

Source/core/rendering/InlineFlowBox.h

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 38 matching lines @@
         , m_nextLineBox(0)
         , m_includeLogicalLeftEdge(false)
         , m_includeLogicalRightEdge(false)
         , m_descendantsHaveSameLineHeightAndBaseline(true)
         , m_baselineType(AlphabeticBaseline)
         , m_hasAnnotationsBefore(false)
         , m_hasAnnotationsAfter(false)
         , m_lineBreakBidiStatusEor(WTF::Unicode::LeftToRight)
         , m_lineBreakBidiStatusLastStrong(WTF::Unicode::LeftToRight)
         , m_lineBreakBidiStatusLast(WTF::Unicode::LeftToRight)
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
         , m_hasBadChildList(false)
 #endif
     {
         // Internet Explorer and Firefox always create a marker for list items, even when the list-style-type is none.  We do not make a marker
         // in the list-style-type: none case, since it is wasteful to do so.  However, in order to match other browsers we have to pretend like
         // an invisible marker exists.  The side effect of having an invisible marker is that the quirks mode behavior of shrinking lines with no
         // text children must not apply.  This change also means that gaps will exist between image bullet list items.  Even when the list bullet
         // is an image, the line is still considered to be immune from the quirk.
         m_hasTextChildren = obj.style()->display() == LIST_ITEM;
         m_hasTextDescendants = m_hasTextChildren;
     }
 
+#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 ~InlineFlowBox();
-
     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
 
     InlineFlowBox* prevLineBox() const { return m_prevLineBox; }
     InlineFlowBox* nextLineBox() const { return m_nextLineBox; }
     void setNextLineBox(InlineFlowBox* n) { m_nextLineBox = n; }
     void setPreviousLineBox(InlineFlowBox* p) { m_prevLineBox = p; }
 
     InlineBox* firstChild() const { checkConsistency(); return m_firstChild; }
@@ skipping 259 matching lines @@
     // If the line contains any ruby runs, then this will be true.
     unsigned m_hasAnnotationsBefore : 1;
     unsigned m_hasAnnotationsAfter : 1;
 
     unsigned m_lineBreakBidiStatusEor : 5; // WTF::Unicode::Direction
     unsigned m_lineBreakBidiStatusLastStrong : 5; // WTF::Unicode::Direction
     unsigned m_lineBreakBidiStatusLast : 5; // WTF::Unicode::Direction
 
     // End of RootInlineBox-specific members.
 
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
 private:
     unsigned m_hasBadChildList : 1;
 #endif
 };
 
 DEFINE_INLINE_BOX_TYPE_CASTS(InlineFlowBox);
 
-#ifdef NDEBUG
+#if !ENABLE(ASSERT)
 inline void InlineFlowBox::checkConsistency() const
 {
 }
 #endif
 
 inline void InlineFlowBox::setHasBadChildList()
 {
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     m_hasBadChildList = true;
 #endif
 }
 
 } // namespace WebCore
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const WebCore::InlineFlowBox*);
 #endif
 
 #endif // InlineFlowBox_h