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

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

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)
Patch Set: m_domTreeVersion initialization 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.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
index 0bb27d46e6593bae0bf234349835fce0f85d932b..a3e77bff32e661a5b1991a9f7d9c25338410e0e6 100644
--- a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
+++ b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
@@ -51,14 +51,12 @@ struct SameSizeAsInlineFlowBox : public InlineBox {
static_assert(sizeof(InlineFlowBox) == sizeof(SameSizeAsInlineFlowBox),
"InlineFlowBox should stay small");
-#if ENABLE(ASSERT)
-
+#if DCHECK_IS_ON()
InlineFlowBox::~InlineFlowBox() {
if (!m_hasBadChildList)
for (InlineBox* child = firstChild(); child; child = child->nextOnLine())
child->setHasBadParent();
}
-
#endif
LayoutUnit InlineFlowBox::getFlowSpacingLogicalWidth() {
@@ -227,13 +225,13 @@ void InlineFlowBox::deleteLine() {
while (child) {
ASSERT(this == child->parent());
next = child->nextOnLine();
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
child->setParent(nullptr);
#endif
child->deleteLine();
child = next;
}
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
m_firstChild = nullptr;
m_lastChild = nullptr;
#endif
@@ -1637,7 +1635,7 @@ void InlineFlowBox::showLineTreeAndMark(const InlineBox* markedBox1,
#endif
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
void InlineFlowBox::checkConsistency() const {
#ifdef CHECK_CONSISTENCY
ASSERT(!m_hasBadChildList);
« no previous file with comments | « third_party/WebKit/Source/core/layout/line/InlineFlowBox.h ('k') | third_party/WebKit/Source/core/layout/line/LineBoxList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698