|
Column balancing support in the region based multicol implementation.
Start by setting the column height to the flow thread's height divided
by the number of columns. Then stretch the column height until
contents fits without creating overflowing columns, or until the
maximum allowed column height is reached, whichever comes first. This
may require several layout iterations (but normally only a
couple). For each time we stretch, stretch by the least amount
required to make a difference to which box goes where.
Also make sure that the columns get tall enough to honor orphans
and widows settings.
This change takes some tiny steps in preparing for multiple column
set support.
This patch is ported from WebKit.
https://bugs.webkit.org/show_bug.cgi?id=116033
Reviewed in WebKit by David Hyatt.
BUG= 252675
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=153028
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+881 lines, -81 lines) |
Patch |
|
A |
LayoutTests/fast/multicol/newmulticol/balance-images.html
|
View
|
|
1 chunk |
+30 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance-images-expected.txt
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance-maxheight1.html
|
View
|
|
1 chunk |
+29 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance-maxheight1-expected.txt
|
View
|
|
1 chunk |
+12 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance-maxheight2.html
|
View
|
|
1 chunk |
+32 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance-maxheight2-expected.txt
|
View
|
|
1 chunk |
+14 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance1.html
|
View
|
|
1 chunk |
+29 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance1-expected.txt
|
View
|
|
1 chunk |
+12 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance2.html
|
View
|
|
1 chunk |
+28 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance2-expected.txt
|
View
|
|
1 chunk |
+11 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance3.html
|
View
|
|
1 chunk |
+26 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance3-expected.txt
|
View
|
|
1 chunk |
+9 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance4.html
|
View
|
|
1 chunk |
+31 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance4-expected.txt
|
View
|
|
1 chunk |
+14 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance5.html
|
View
|
|
1 chunk |
+34 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance5-expected.txt
|
View
|
|
1 chunk |
+17 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance6.html
|
View
|
|
1 chunk |
+24 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance6-expected.txt
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance7.html
|
View
|
|
1 chunk |
+36 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance7-expected.txt
|
View
|
|
1 chunk |
+18 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance8.html
|
View
|
|
1 chunk |
+36 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance8-expected.txt
|
View
|
|
1 chunk |
+18 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance9.html
|
View
|
|
1 chunk |
+36 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/balance9-expected.txt
|
View
|
|
1 chunk |
+18 lines, -0 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/fast/multicol/newmulticol/cell-shrinkback.html
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/fast/multicol/newmulticol/cell-shrinkback-expected.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/fast/multicol/newmulticol/columns-shorthand-parsing.html
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/fast/multicol/newmulticol/columns-shorthand-parsing-expected.html
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/orphans-and-widows-balance.html
|
View
|
|
1 chunk |
+32 lines, -0 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/multicol/newmulticol/orphans-and-widows-balance-expected.txt
|
View
|
|
1 chunk |
+15 lines, -0 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/fast/multicol/newmulticol/single-line.html
|
View
|
|
2 chunks |
+6 lines, -2 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/fast/multicol/newmulticol/single-line-expected.html
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderBlock.h
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderBlock.cpp
|
View
|
|
5 chunks |
+52 lines, -8 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderBox.cpp
|
View
|
|
1 chunk |
+4 lines, -1 line |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderFlowThread.h
|
View
|
|
1 chunk |
+4 lines, -1 line |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderMultiColumnBlock.h
|
View
|
|
2 chunks |
+4 lines, -5 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderMultiColumnBlock.cpp
|
View
|
|
4 chunks |
+47 lines, -17 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderMultiColumnFlowThread.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderMultiColumnFlowThread.cpp
|
View
|
|
1 chunk |
+17 lines, -6 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderMultiColumnSet.h
|
View
|
|
3 chunks |
+26 lines, -12 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/RenderMultiColumnSet.cpp
|
View
|
|
6 chunks |
+124 lines, -28 lines |
0 comments
|
Download
|
Total messages: 4 (0 generated)
|