Skip to content

Commit 42160a8

Browse files
Javier Contreras Tenoriochromium-wpt-export-bot
authored andcommitted
[masonry] Make grid-axis rules be blocked by spanners
Record each lane entry's unique placement ID during the existing `CrossGap` walk. For each `MainGap`, merge the sorted `CrossGap` runs from its adjacent lanes and compare the entry IDs for every resulting segment. We store the blocked ranges using `GapSegmentStateRanges`, the same way that the other containers do this. Then we reuse the same linear segment walker during paint to generate intersection offsets. Some WPT ref files required changes, due to recent resolutions reached by the CSSWG w3c/csswg-drafts#14153 to reflect per-lane stacking-axis gutters. We add more WPT coverage including for rule-break: intersection and none. We are explicitly deferring `overlap-join` grid lanes implementation as a follow up Bug: 343257585 Change-Id: Ia2d917fb4d1ff109564a50dc60e687797ec9e301 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8261939 Reviewed-by: Kurt Catti-Schmidt <kschmi@microsoft.com> Commit-Queue: Javier Contreras <javiercon@microsoft.com> Cr-Commit-Position: refs/heads/main@{#1682509}
1 parent bd21c58 commit 42160a8

27 files changed

Lines changed: 452 additions & 28 deletions

css/css-gaps/grid-lanes/column-gap-decorations-006-ref.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
</div>
3535
<div class="col-rule" style="left: 89px; top: 66px; height: 106px;"></div>
3636
<div class="col-rule" style="left: 185px; top: 0; height: 172px;"></div>
37-
<div class="row-rule" style="top: 59px; left: 0; width: 182px;"></div>
37+
<div class="row-rule" style="top: 59px; left: 0; width: 86px;"></div>
38+
<div class="row-rule" style="top: 59px; left: 96px; width: 86px;"></div>
3839
<div class="row-rule" style="top: 117px; left: 0; width: 86px;"></div>
3940
<div class="row-rule" style="top: 117px; left: 96px; width: 86px;"></div>
4041
<div class="row-rule" style="top: 81px; left: 192px; width: 86px;"></div>

css/css-gaps/grid-lanes/column-gap-decorations-007-ref.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
</div>
3838
<div class="col-rule" style="left: 89px; top: 0; height: 110px;"></div>
3939
<div class="col-rule" style="left: 185px; top: 0; height: 160px;"></div>
40-
<div class="row-rule" style="top: 113px; left: 0; width: 182px;"></div>
40+
<div class="row-rule" style="top: 113px; left: 0; width: 86px;"></div>
41+
<div class="row-rule" style="top: 113px; left: 96px; width: 86px;"></div>
4142
<div class="row-rule" style="top: 43px; left: 96px; width: 86px;"></div>
4243
<div class="row-rule" style="top: 43px; left: 192px; width: 86px;"></div>
43-
<div class="row-rule" style="top: 113px; left: 192px; width: 86px;"></div>
44+
<div class="row-rule" style="top: 93px; left: 192px; width: 86px;"></div>

css/css-gaps/grid-lanes/column-gap-decorations-014-ref.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<div class="col-rule" style="left: 137px; top: 108px; height: 44px;"></div>
3737
<div class="col-rule" style="left: 209px; top: 0; height: 206px;"></div>
3838
<div class="row-rule" style="top: 47px; left: 0; width: 62px;"></div>
39-
<div class="row-rule" style="top: 47px; left: 72px; width: 134px;"></div>
39+
<div class="row-rule" style="top: 47px; left: 72px; width: 62px;"></div>
40+
<div class="row-rule" style="top: 47px; left: 144px; width: 62px;"></div>
4041
<div class="row-rule" style="top: 101px; left: 72px; width: 62px;"></div>
41-
<div class="row-rule" style="top: 155px; left: 72px; width: 134px;"></div>
42+
<div class="row-rule" style="top: 155px; left: 72px; width: 62px;"></div>
43+
<div class="row-rule" style="top: 155px; left: 144px; width: 62px;"></div>
4244
<div class="row-rule" style="top: 47px; left: 216px; width: 62px;"></div>

css/css-gaps/grid-lanes/column-gap-decorations-017-ref.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
</div>
4141
<div class="col-rule" style="left: 89px; top: 0; height: 110px;"></div>
4242
<div class="col-rule" style="left: 185px; top: 0; height: 160px;"></div>
43-
<div class="row-rule" style="top: 113px; left: 0; width: 182px;"></div>
43+
<div class="row-rule" style="top: 113px; left: 0; width: 86px;"></div>
44+
<div class="row-rule" style="top: 113px; left: 96px; width: 86px;"></div>
4445
<div class="row-rule" style="top: 43px; left: 96px; width: 86px;"></div>
4546
<div class="row-rule" style="top: 43px; left: 192px; width: 86px;"></div>
46-
<div class="row-rule" style="top: 113px; left: 192px; width: 86px;"></div>
47+
<div class="row-rule" style="top: 93px; left: 192px; width: 86px;"></div>

css/css-gaps/grid-lanes/column-gap-decorations-018-ref.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@
3737
<div class="col-rule" style="left: 89px; top: 0; height: 250px;"></div>
3838
<div class="col-rule" style="left: 185px; top: 100px; height: 150px;"></div>
3939
<div class="row-rule" style="top: 153px; left: 0; width: 86px;"></div>
40-
<div class="row-rule" style="top: 93px; left: 96px; width: 182px;"></div>
40+
<div class="row-rule" style="top: 93px; left: 96px; width: 86px;"></div>
41+
<div class="row-rule" style="top: 93px; left: 192px; width: 86px;"></div>

css/css-gaps/grid-lanes/column-gap-decorations-019-ref.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,9 @@
3535
</div>
3636
<div class="col-rule" style="left: 89px; top: 0; height: 150px;"></div>
3737
<div class="col-rule" style="left: 185px; top: 0; height: 150px;"></div>
38-
<div class="row-rule" style="top: 153px; left: 0; width: 278px;"></div>
39-
<div class="row-rule" style="top: 263px; left: 0; width: 278px;"></div>
38+
<div class="row-rule" style="top: 153px; left: 0; width: 86px;"></div>
39+
<div class="row-rule" style="top: 153px; left: 96px; width: 86px;"></div>
40+
<div class="row-rule" style="top: 153px; left: 192px; width: 86px;"></div>
41+
<div class="row-rule" style="top: 263px; left: 0; width: 86px;"></div>
42+
<div class="row-rule" style="top: 263px; left: 96px; width: 86px;"></div>
43+
<div class="row-rule" style="top: 263px; left: 192px; width: 86px;"></div>

css/css-gaps/grid-lanes/column-gap-decorations-022-ref.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
<div class="hi">6</div>
4141
<div>7</div>
4242
</div>
43-
<div class="col-rule" style="left: 89px; top: 0; height: 50px;"></div>
4443
<div class="col-rule" style="left: 89px; top: 110px; height: 110px;"></div>
4544
<div class="col-rule" style="left: 185px; top: 0; height: 220px;"></div>
4645
<div class="row-rule" style="top: 103px; left: 0; width: 86px;"></div>
46+
<div class="row-rule" style="top: 103px; left: 96px; width: 86px;"></div>
4747
<div class="row-rule" style="top: 173px; left: 96px; width: 86px;"></div>
4848
<div class="row-rule" style="top: 103px; left: 192px; width: 86px;"></div>
4949
<div class="row-rule" style="top: 173px; left: 192px; width: 86px;"></div>

css/css-gaps/grid-lanes/column-gap-decorations-023-ref.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,8 @@
3636
</div>
3737
<div class="col-rule" style="left: 89px; top: 50px; height: 90px;"></div>
3838
<div class="col-rule" style="left: 185px; top: 50px; height: 140px;"></div>
39-
<div class="row-rule" style="top: 43px; left: 0; width: 278px;"></div>
40-
<div class="row-rule" style="top: 143px; left: 0; width: 182px;"></div>
39+
<div class="row-rule" style="top: 43px; left: 0; width: 86px;"></div>
40+
<div class="row-rule" style="top: 43px; left: 96px; width: 86px;"></div>
41+
<div class="row-rule" style="top: 43px; left: 192px; width: 86px;"></div>
42+
<div class="row-rule" style="top: 143px; left: 0; width: 86px;"></div>
43+
<div class="row-rule" style="top: 143px; left: 96px; width: 86px;"></div>

css/css-gaps/grid-lanes/column-gap-decorations-028-ref.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
</div>
3838
<div class="col-rule" style="left: 63px; top: 0; height: 100px;"></div>
3939
<div class="col-rule" style="left: 133px; top: 0; height: 40px;"></div>
40-
<div class="col-rule" style="left: 133px; top: 80px; height: 20px;"></div>
41-
<div class="row-rule" style="top: 43px; left: 70px; width: 130px;"></div>
42-
<div class="row-rule" style="top: 103px; left: 0; width: 200px;"></div>
40+
<div class="row-rule" style="top: 43px; left: 140px; width: 60px;"></div>
41+
<div class="row-rule" style="top: 103px; left: 0; width: 60px;"></div>
42+
<div class="row-rule" style="top: 103px; left: 70px; width: 60px;"></div>
43+
<div class="row-rule" style="top: 103px; left: 140px; width: 60px;"></div>

css/css-gaps/grid-lanes/column-gap-decorations-029-ref.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,3 @@
3636
</div>
3737
<div class="col-rule" style="left: 63px; top: 0; height: 100px;"></div>
3838
<div class="col-rule" style="left: 133px; top: 0; height: 40px;"></div>
39-
<div class="col-rule" style="left: 133px; top: 80px; height: 20px;"></div>

0 commit comments

Comments
 (0)