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

Unified Diff: Source/core/rendering/RenderMultiColumnSet.cpp

Issue 264773018: [New Multicolumn] Remove the term "balancing" from some member names. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code review. Created 6 years, 7 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/rendering/RenderMultiColumnSet.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « Source/core/rendering/RenderMultiColumnSet.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698