Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1185)

Unified Diff: Source/core/rendering/InlineBox.h

Issue 397733004: Allow assertions to be enabled in Blink Release builds. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/FloatingObjects.cpp ('k') | Source/core/rendering/InlineBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/InlineBox.h
diff --git a/Source/core/rendering/InlineBox.h b/Source/core/rendering/InlineBox.h
index 2f3312f31f88b2b64ce77bd5ca6e57036f673428..d7cfa494ff854406dcde05f4d3e487a38dc1fa2d 100644
--- a/Source/core/rendering/InlineBox.h
+++ b/Source/core/rendering/InlineBox.h
@@ -44,7 +44,7 @@ public:
, m_parent(0)
, m_renderer(obj)
, m_logicalWidth(0)
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
, m_hasBadParent(false)
#endif
{
@@ -59,7 +59,7 @@ public:
, m_topLeft(topLeft)
, m_logicalWidth(logicalWidth)
, m_bitfields(firstLine, constructed, dirty, extracted, isHorizontal)
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
, m_hasBadParent(false)
#endif
{
@@ -268,7 +268,7 @@ public:
// visibleLeftEdge, visibleRightEdge are in the parent's coordinate system.
virtual float placeEllipsisBox(bool ltr, float visibleLeftEdge, float visibleRightEdge, float ellipsisWidth, float &truncatedWidth, bool&);
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
void setHasBadParent();
#endif
@@ -409,18 +409,18 @@ protected:
private:
InlineBoxBitfields m_bitfields;
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
bool m_hasBadParent;
#endif
};
-#ifdef NDEBUG
+#if !ENABLE(ASSERT)
inline InlineBox::~InlineBox()
{
}
#endif
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
inline void InlineBox::setHasBadParent()
{
m_hasBadParent = true;
« no previous file with comments | « Source/core/rendering/FloatingObjects.cpp ('k') | Source/core/rendering/InlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698