Skip to content

Commit 6f1be26

Browse files
mstenshochromium-wpt-export-bot
authored andcommitted
Block-in-inline: Stay in parallel flow, once established.
When a block has been overflowed, we normally establish a parallel fragmentation flow for content inside it, but this is disabled if preceded by a column spanner. If the column spanner is discovered "too" late, we may have entered a parallel flow. Then stay in this parallel flow even if a spanner is discovered, or else the outgoing break tokens are lost. It could be that the inline layout algorithm ought to be refactored to handle this better, but this is all thanks to crbug.com/430249827 and is a situation that should never occur, so probably not worth it. Also update a DCHECK, so that it makes the same exception for inline break tokens as it already did for block break tokens. Bug: 364933065 Change-Id: I5051ca952f6247f691b956f68111a9d811158de7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6714627 Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org> Reviewed-by: Koji Ishii <kojii@chromium.org> Commit-Queue: Morten Stenshorne <mstensho@chromium.org> Cr-Commit-Position: refs/heads/main@{#1484003}
1 parent 1aec529 commit 6f1be26

2 files changed

Lines changed: 28 additions & 0 deletions

File tree

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!DOCTYPE html>
2+
<title>Nested multicol, overflowed block with spanner in next outer column</title>
3+
<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
4+
<link rel="help" href="https://issues.chromium.org/issues/364933065">
5+
<div style="columns:2; column-fill:auto; height:100px;">
6+
<div style="columns:2; column-fill:auto;">
7+
<span>
8+
<div style="height:10px;">
9+
<span style="outline:solid;">
10+
<div style="height:205px;"></div>
11+
<div style="column-span:all; height:20px;"></div>
12+
</span>
13+
</div>
14+
</span>
15+
</div>
16+
</div>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!DOCTYPE html>
2+
<title>Overflowed block with spanner</title>
3+
<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
4+
<link rel="help" href="https://issues.chromium.org/issues/364933065">
5+
<div style="columns:2; column-fill:auto; height:100px; line-height:50px;">
6+
<span>
7+
<div style="height:100px;">
8+
<div style="height:150px;"></div>
9+
<div style="column-span:all; height:20px;"></div>
10+
</div>
11+
</span>
12+
</div>

0 commit comments

Comments
 (0)