Index: Source/core/rendering/RenderMultiColumnSet.cpp |
diff --git a/Source/core/rendering/RenderMultiColumnSet.cpp b/Source/core/rendering/RenderMultiColumnSet.cpp |
index 01711123b4832c8d39ff2a6cd0ea71dad9bf1853..3b4b48dcf3a152eb1f6231ac252c6fa77717176f 100644 |
--- a/Source/core/rendering/RenderMultiColumnSet.cpp |
+++ b/Source/core/rendering/RenderMultiColumnSet.cpp |
@@ -143,7 +143,7 @@ void RenderMultiColumnSet::distributeImplicitBreaks() |
} |
} |
-LayoutUnit RenderMultiColumnSet::calculateBalancedHeight(bool initial) const |
+LayoutUnit RenderMultiColumnSet::calculateColumnHeight(bool initial) const |
{ |
if (initial) { |
// Start with the lowest imaginable column height. |
@@ -191,14 +191,14 @@ void RenderMultiColumnSet::addForcedBreak(LayoutUnit offsetFromFirstPage) |
m_contentRuns.append(ContentRun(offsetFromFirstPage)); |
} |
-bool RenderMultiColumnSet::recalculateBalancedHeight(bool initial) |
+bool RenderMultiColumnSet::recalculateColumnHeight(bool initial) |
{ |
ASSERT(multiColumnFlowThread()->requiresBalancing()); |
LayoutUnit oldColumnHeight = m_computedColumnHeight; |
if (initial) |
distributeImplicitBreaks(); |
- LayoutUnit newColumnHeight = calculateBalancedHeight(initial); |
+ LayoutUnit newColumnHeight = calculateColumnHeight(initial); |
setAndConstrainColumnHeight(newColumnHeight); |
// After having calculated an initial column height, the multicol container typically needs at |