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

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

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
Index: Source/core/rendering/RenderMultiColumnSet.h
diff --git a/Source/core/rendering/RenderMultiColumnSet.h b/Source/core/rendering/RenderMultiColumnSet.h
index 57b09aa1136649e8c7f6369f2307dd737150b68e..aea516ca68691e90351a531794ff7069057a371e 100644
--- a/Source/core/rendering/RenderMultiColumnSet.h
+++ b/Source/core/rendering/RenderMultiColumnSet.h
@@ -88,10 +88,10 @@ public:
void clearForcedBreaks();
void addForcedBreak(LayoutUnit offsetFromFirstPage);
- // (Re-)calculate the column height when contents are supposed to be balanced. If 'initial' is
- // set, guess an initial column height; otherwise, stretch the column height a tad. Return true
- // if column height changed and another layout pass is required.
- bool recalculateBalancedHeight(bool initial);
+ // (Re-)calculate the column height if it's auto. If 'initial' is set, guess an initial column
+ // height; otherwise, stretch the column height a tad. Return true if column height changed and
+ // another layout pass is required.
+ bool recalculateColumnHeight(bool initial);
// Record space shortage (the amount of space that would have been enough to prevent some
// element from being moved to the next column) at a column break. The smallest amount of space
@@ -150,7 +150,7 @@ private:
// and store the results. This is needed in order to balance the columns.
void distributeImplicitBreaks();
- LayoutUnit calculateBalancedHeight(bool initial) const;
+ LayoutUnit calculateColumnHeight(bool initial) const;
unsigned m_computedColumnCount; // Used column count (the resulting 'N' from the pseudo-algorithm in the multicol spec)
LayoutUnit m_computedColumnWidth; // Used column width (the resulting 'W' from the pseudo-algorithm in the multicol spec)
« no previous file with comments | « Source/core/rendering/RenderMultiColumnFlowThread.cpp ('k') | Source/core/rendering/RenderMultiColumnSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698