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

Unified Diff: Source/core/layout/MultiColumnFragmentainerGroup.cpp

Issue 1209693002: Remove LayoutFlowThread::maxLogicalHeight(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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
Index: Source/core/layout/MultiColumnFragmentainerGroup.cpp
diff --git a/Source/core/layout/MultiColumnFragmentainerGroup.cpp b/Source/core/layout/MultiColumnFragmentainerGroup.cpp
index 2686f830f32ef5df685fa072c0b73aa07da4ccbd..9be58ba7b54fa3d5270dc69ce2af40bbf0b4fa67 100644
--- a/Source/core/layout/MultiColumnFragmentainerGroup.cpp
+++ b/Source/core/layout/MultiColumnFragmentainerGroup.cpp
@@ -113,7 +113,7 @@ bool MultiColumnFragmentainerGroup::recalculateColumnHeight(BalancedColumnHeight
if (m_columnHeight == oldColumnHeight)
return false; // No change. We're done.
- m_minSpaceShortage = LayoutFlowThread::maxLogicalHeight();
+ m_minSpaceShortage = LayoutUnit::max();
return true; // Need another pass.
}
@@ -337,7 +337,7 @@ LayoutUnit MultiColumnFragmentainerGroup::calculateMaxColumnHeight() const
LayoutBlockFlow* multicolBlock = m_columnSet.multiColumnBlockFlow();
const ComputedStyle& multicolStyle = multicolBlock->styleRef();
LayoutUnit availableHeight = m_columnSet.multiColumnFlowThread()->columnHeightAvailable();
- LayoutUnit maxColumnHeight = availableHeight ? availableHeight : LayoutFlowThread::maxLogicalHeight();
+ LayoutUnit maxColumnHeight = availableHeight ? availableHeight : LayoutUnit::max();
if (!multicolStyle.logicalMaxHeight().isMaxSizeNone()) {
LayoutUnit logicalMaxHeight = multicolBlock->computeContentLogicalHeight(MaxSize, multicolStyle.logicalMaxHeight(), -1);
if (logicalMaxHeight != -1 && maxColumnHeight > logicalMaxHeight)
@@ -433,8 +433,8 @@ LayoutUnit MultiColumnFragmentainerGroup::calculateColumnHeight(BalancedColumnHe
// amount of space shortage found during layout.
ASSERT(m_minSpaceShortage > 0); // We should never _shrink_ the height!
- ASSERT(m_minSpaceShortage != LayoutFlowThread::maxLogicalHeight()); // If this happens, we probably have a bug.
- if (m_minSpaceShortage == LayoutFlowThread::maxLogicalHeight())
+ ASSERT(m_minSpaceShortage != LayoutUnit::max()); // If this happens, we probably have a bug.
+ if (m_minSpaceShortage == LayoutUnit::max())
return m_columnHeight; // So bail out rather than looping infinitely.
return m_columnHeight + m_minSpaceShortage;

Powered by Google App Engine
This is Rietveld 408576698