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

Unified Diff: third_party/WebKit/Source/core/layout/line/InlineFlowBox.h

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)
Patch Set: Created 3 years, 11 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
Index: third_party/WebKit/Source/core/layout/line/InlineFlowBox.h
diff --git a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.h b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.h
index 3c657572fc7ad4fa1485da06903b32a61a9e1cc7..acf143bc97088ab3e65da4b38df9a7cae9aa5596 100644
--- a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.h
+++ b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.h
@@ -59,7 +59,7 @@ class InlineFlowBox : public InlineBox {
m_lineBreakBidiStatusLastStrong(WTF::Unicode::LeftToRight),
m_lineBreakBidiStatusLast(WTF::Unicode::LeftToRight),
m_isFirstAfterPageBreak(false)
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
,
m_hasBadChildList(false)
#endif
@@ -77,7 +77,7 @@ class InlineFlowBox : public InlineBox {
m_hasTextDescendants = m_hasTextChildren;
}
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
~InlineFlowBox() override;
#endif
@@ -474,7 +474,7 @@ class InlineFlowBox : public InlineBox {
// End of RootInlineBox-specific members.
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
private:
unsigned m_hasBadChildList : 1;
#endif
@@ -482,12 +482,12 @@ class InlineFlowBox : public InlineBox {
DEFINE_INLINE_BOX_TYPE_CASTS(InlineFlowBox);
-#if !ENABLE(ASSERT)
+#if !DCHECK_IS_ON()
inline void InlineFlowBox::checkConsistency() const {}
#endif
inline void InlineFlowBox::setHasBadChildList() {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
m_hasBadChildList = true;
#endif
}

Powered by Google App Engine
This is Rietveld 408576698