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

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

Issue 327323002: Start removing the double-negative !ASSERT_DISABLED (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/page/Page.cpp ('k') | Source/core/rendering/LayoutState.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/LayoutState.h
diff --git a/Source/core/rendering/LayoutState.h b/Source/core/rendering/LayoutState.h
index e743ccbcd62a81b53f1c95f62b0f7e2e1c4a07be..b873b3fbd075880cd11ca21b3f815fd39b4776a4 100644
--- a/Source/core/rendering/LayoutState.h
+++ b/Source/core/rendering/LayoutState.h
@@ -46,7 +46,7 @@ public:
: m_clipped(false)
, m_isPaginated(pageLogicalHeight)
, m_pageLogicalHeightChanged(pageLogicalHeightChanged)
-#if !ASSERT_DISABLED
+#if ASSERT_ENABLED
, m_layoutDeltaXSaturated(false)
, m_layoutDeltaYSaturated(false)
#endif
@@ -80,7 +80,7 @@ public:
void addLayoutDelta(const LayoutSize& delta)
{
m_layoutDelta += delta;
-#if !ASSERT_DISABLED
+#if ASSERT_ENABLED
m_layoutDeltaXSaturated |= m_layoutDelta.width() == LayoutUnit::max() || m_layoutDelta.width() == LayoutUnit::min();
m_layoutDeltaYSaturated |= m_layoutDelta.height() == LayoutUnit::max() || m_layoutDelta.height() == LayoutUnit::min();
#endif
@@ -106,7 +106,7 @@ public:
#ifndef NDEBUG
RenderObject* renderer() const { return m_renderer; }
#endif
-#if !ASSERT_DISABLED
+#if ASSERT_ENABLED
bool layoutDeltaXSaturated() const { return m_layoutDeltaXSaturated; }
bool layoutDeltaYSaturated() const { return m_layoutDeltaYSaturated; }
#endif
@@ -117,7 +117,7 @@ private:
bool m_isPaginated:1;
// If our page height has changed, this will force all blocks to relayout.
bool m_pageLogicalHeightChanged:1;
-#if !ASSERT_DISABLED
+#if ASSERT_ENABLED
bool m_layoutDeltaXSaturated:1;
bool m_layoutDeltaYSaturated:1;
#endif
« no previous file with comments | « Source/core/page/Page.cpp ('k') | Source/core/rendering/LayoutState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698