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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h

Issue 1399493002: Column balancing refactoring. Don't propagate data during layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more code review Created 5 years, 2 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: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h
index 449d22553deac207031792dc43e677f23fe59466..f8ee93602a59446033603da42e1b9d6ad3b8012a 100644
--- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h
+++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h
@@ -101,12 +101,11 @@ enum BalancedColumnHeightCalculation { GuessFromFlowThreadPortion, StretchBySpac
// turn out that the calculated height wasn't enough, though. We'll notice this at end of layout. If
// we end up with too many columns (i.e. columns overflowing the multicol container), it wasn't
// enough. In this case we need to increase the column heights. We'll increase them by the lowest
-// amount of space that could possibly affect where the breaks occur (see
-// LayoutMultiColumnSet::recordSpaceShortage()). We'll relayout (to find new break points and the
-// new lowest amount of space increase that could affect where they occur, in case we need another
-// round) until we've reached an acceptable height (where everything fits perfectly in the number of
-// columns that we have specified). The rule of thumb is that we shouldn't have to perform more of
-// such iterations than the number of columns that we have.
+// amount of space that could possibly affect where the breaks occur. We'll relayout (to find new
+// break points and the new lowest amount of space increase that could affect where they occur, in
+// case we need another round) until we've reached an acceptable height (where everything fits
+// perfectly in the number of columns that we have specified). The rule of thumb is that we
+// shouldn't have to perform more of such iterations than the number of columns that we have.
//
// For each layout iteration done for column balancing, the flow thread will need a deep layout if
// column heights changed in the previous pass, since column height changes may affect break points
@@ -227,9 +226,8 @@ private:
void computePreferredLogicalWidths() override;
void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
void updateLogicalWidth() override;
- void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage) override;
+ void contentWasLaidOut(LayoutUnit logicalTopInFlowThreadAfterPagination) override;
void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight) override;
- bool addForcedColumnBreak(LayoutUnit, LayoutObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = nullptr) override;
// The last set we worked on. It's not to be used as the "current set". The concept of a
// "current set" is difficult, since layout may jump back and forth in the tree, due to wrong

Powered by Google App Engine
This is Rietveld 408576698