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

Unified Diff: third_party/WebKit/Source/core/layout/line/InlineBox.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/InlineBox.h
diff --git a/third_party/WebKit/Source/core/layout/line/InlineBox.h b/third_party/WebKit/Source/core/layout/line/InlineBox.h
index 244049ea7251922748cf7390c7caf5c6fccf8fbe..16a2ed28a535e6c82b5770ac4907d79c175957b3 100644
--- a/third_party/WebKit/Source/core/layout/line/InlineBox.h
+++ b/third_party/WebKit/Source/core/layout/line/InlineBox.h
@@ -51,10 +51,6 @@ class CORE_EXPORT InlineBox : public DisplayItemClient {
m_parent(nullptr),
m_lineLayoutItem(obj),
m_logicalWidth()
-#if ENABLE(ASSERT)
- ,
- m_hasBadParent(false)
-#endif
{
}
@@ -76,10 +72,6 @@ class CORE_EXPORT InlineBox : public DisplayItemClient {
m_lineLayoutItem(item),
m_location(topLeft),
m_logicalWidth(logicalWidth)
-#if ENABLE(ASSERT)
- ,
- m_hasBadParent(false)
-#endif
{
}
@@ -333,7 +325,7 @@ class CORE_EXPORT InlineBox : public DisplayItemClient {
LayoutUnit& truncatedWidth,
bool&);
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
void setHasBadParent();
#endif
@@ -549,16 +541,16 @@ class CORE_EXPORT InlineBox : public DisplayItemClient {
LayoutUnit m_logicalWidth;
private:
-#if ENABLE(ASSERT)
- bool m_hasBadParent;
+#if DCHECK_IS_ON()
+ bool m_hasBadParent = false;
#endif
};
-#if !ENABLE(ASSERT)
+#if !DCHECK_IS_ON()
inline InlineBox::~InlineBox() {}
#endif
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
inline void InlineBox::setHasBadParent() {
m_hasBadParent = true;
}

Powered by Google App Engine
This is Rietveld 408576698