tor-browser

The Tor Browser
git clone https://git.dasho.dev/tor-browser.git
Log | Files | Refs | README | LICENSE

commit 27115226181406b0c675ddaaf9754734471c2191
parent 12d74093479ed18e7df99d3bd533f7b1b4f5f1a3
Author: Alison Maher <almaher@microsoft.com>
Date:   Thu,  9 Oct 2025 18:06:59 +0000

Bug 1992110 [wpt PR 55141] - [Masonry] Remove special % handling for intrinsic auto repeats, a=testonly

Automatic update from web-platform-tests
[Masonry] Remove special % handling for intrinsic auto repeats

Per the CSSWG resolution in issue 12432 [1], we should use intrinsic
sizing for resolving the number of intrinsic repetitions when an item
is sized in that direction via a %.

This was accomplished by removing the special % handling when creating
a constraint space in [2].

All relevant tests have been updated accordingly.

[1] https://github.com/w3c/csswg-drafts/issues/12432
[2] https://chromium-review.googlesource.com/c/chromium/src/+/6692514/15/third_party/blink/renderer/core/layout/masonry/masonry_layout_algorithm.cc#123

Bug: 343257585, 439804186
Change-Id: I29520a1f0947eacea5c8d498fc361a4e90ae6dcb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6995641
Commit-Queue: Alison Maher <almaher@microsoft.com>
Reviewed-by: Kurt Catti-Schmidt <kschmi@microsoft.com>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1522540}

--

wpt-commits: ea473244ad72c4ee52ef76322b98511abbc7a8e2
wpt-pr: 55141

Diffstat:
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-002-ref.html | 6++++--
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-002.html | 4+++-
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-003-ref.html | 6++++--
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-003.html | 4+++-
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-023-ref.html | 2+-
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-024.html | 10+---------
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-027.html | 1-
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-028-ref.html | 2+-
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-fit-content-002-ref.html | 4++--
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-min-content-002-ref.html | 4++--
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-002-ref.html | 18++++++++++--------
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-002.html | 4+++-
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-003-ref.html | 9++++++---
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-003.html | 6++++--
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-023-ref.html | 16+++++++++-------
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-023.html | 12++++++------
Dtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-024-ref.html | 27---------------------------
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-024.html | 14+++++++-------
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-027-ref.html | 15++++++++-------
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-027.html | 12++++++------
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-fit-content-002-ref.html | 9+++++----
Dtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-max-content-002-ref.html | 41-----------------------------------------
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-max-content-002.html | 2+-
Dtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-min-content-002-ref.html | 41-----------------------------------------
Mtesting/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-min-content-002.html | 2+-
25 files changed, 87 insertions(+), 184 deletions(-)

diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-002-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-002-ref.html @@ -1,13 +1,15 @@ <!DOCTYPE html> <html> +<link rel="stylesheet" href="/fonts/ahem.css"> <style> .grid { display: grid; - grid-template-columns: auto auto auto auto; + grid-template-columns: repeat(3, 120px); grid-template-rows: 100px 100px; background: gray; - width: 400px; + width: 360px; height: 200px; + font: 15px/1 Ahem; } .grid > div { diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-002.html @@ -4,14 +4,16 @@ <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="column-auto-repeat-auto-002-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> +<link rel="stylesheet" href="/fonts/ahem.css"> <style> .masonry { display: masonry; background: gray; item-tolerance: 0; grid-template-columns: repeat(auto-fill, auto); - width: 400px; + width: 360px; height: 200px; + font: 15px/1 Ahem; } .masonry > div { diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-003-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-003-ref.html @@ -1,13 +1,15 @@ <!DOCTYPE html> <html> +<link rel="stylesheet" href="/fonts/ahem.css"> <style> .grid { display: grid; - grid-template-columns: 100px 100px 100px 100px; + grid-template-columns: repeat(6, 60px); grid-template-rows: 50px 50px 50px 50px; background: gray; - width: 400px; + width: 360px; height: 200px; + font: 15px/1 Ahem; } .grid > div { diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-003.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-003.html @@ -4,14 +4,16 @@ <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="column-auto-repeat-auto-003-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> +<link rel="stylesheet" href="/fonts/ahem.css"> <style> .masonry { display: masonry; background: gray; item-tolerance: 0; grid-template-columns: repeat(auto-fill, auto); - width: 400px; + width: 360px; height: 200px; + font: 15px/1 Ahem; } .masonry > div { diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-023-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-023-ref.html @@ -3,7 +3,7 @@ <style> .grid { display: grid; - grid-template-columns: auto; + grid-template-columns: auto auto auto; width: 400px; gap: 10px; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-024.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-024.html @@ -3,8 +3,7 @@ <title>Auto repeat tracks with fixed size and replaced items</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> +<link rel="match" href="column-auto-repeat-auto-023-ref.html"> <style> .masonry { display: masonry; @@ -28,11 +27,4 @@ img { <img src="../../../resources/pink-image.png" width="113" height="120"></img> <img src="../../../resources/pink-image.png" width="113" height="120"></img> </div> -<script> - test(function() { - let image = document.getElementById("test"); - assert_equals(image.getBoundingClientRect().width, 400); - assert_approx_equals(image.getBoundingClientRect().width / image.getBoundingClientRect().height, 113 / 120, .006); - }); -</script> </html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-027.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-027.html @@ -32,7 +32,6 @@ img { <script> test(function() { let image = document.getElementById("test"); - assert_equals(image.getBoundingClientRect().width, 400); assert_equals(image.getBoundingClientRect().width / image.getBoundingClientRect().height, 1); }); </script> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-028-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-028-ref.html @@ -5,7 +5,7 @@ display: grid; background: gray; item-tolerance: 0; - grid-template-columns: auto; + grid-template-columns: repeat(auto-fill, 1px); width: auto; height: auto; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-fit-content-002-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-fit-content-002-ref.html @@ -5,8 +5,8 @@ .grid { display: grid; background: gray; - grid-template-columns: repeat(2, fit-content(100px)); - grid-template-rows: 100px 100px; + grid-template-columns: repeat(3, fit-content(100px)); + grid-template-rows: repeat(3, 100px); width: 300px; height: 300px; font: 15px/1 Ahem; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-min-content-002-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-min-content-002-ref.html @@ -5,8 +5,8 @@ .grid { display: grid; background: gray; - grid-template-columns: repeat(2, min-content); - grid-template-rows: 100px 100px; + grid-template-columns: repeat(3, min-content); + grid-template-rows: repeat(3, 100px); width: 300px; height: 300px; font: 15px/1 Ahem; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-002-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-002-ref.html @@ -1,13 +1,15 @@ <!DOCTYPE html> <html> +<link rel="stylesheet" href="/fonts/ahem.css"> <style> .grid { display: grid; - grid-template-rows: auto auto auto auto; - grid-template-columns: 100px 100px; + grid-template-rows: repeat(5, 30px); + grid-template-columns: 100px; background: gray; width: 200px; - height: 400px; + height: 360px; + font: 15px/1 Ahem; } .grid > div { @@ -19,18 +21,18 @@ <div style="background: lightskyblue;"> Number 1 </div> - <div style="background: orange;"> - Number 5 - </div> <div style="background: lightcoral;"> Number 2 </div> - <div style="background: lightgreen; grid-row: 3;"> + <div style="background: lightgreen;"> Number 3 </div> - <div style="background: lightpink; grid-row: 4;"> + <div style="background: lightpink;"> Number 4 </div> + <div style="background: orange;"> + Number 5 + </div> </div> </body> </html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-002.html @@ -4,6 +4,7 @@ <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="row-auto-repeat-auto-002-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> +<link rel="stylesheet" href="/fonts/ahem.css"> <style> .masonry { display: masonry; @@ -12,7 +13,8 @@ masonry-direction: row; grid-template-rows: repeat(auto-fill, auto); width: 200px; - height: 400px; + height: 360px; + font: 15px/1 Ahem; } .masonry > div { diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-003-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-003-ref.html @@ -1,17 +1,20 @@ <!DOCTYPE html> <html> +<link rel="stylesheet" href="/fonts/ahem.css"> <style> .grid { display: grid; - grid-template-rows: 100px 100px 100px 100px; - grid-template-columns: 50px 50px 50px 50px; + grid-template-rows: repeat(11, 15px); + grid-template-columns: min-content; background: gray; width: 200px; - height: 400px; + height: 360px; + font: 15px/1 Ahem; } .grid > div { height: 75%; + width: min-content; } </style> <body> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-003.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-003.html @@ -4,6 +4,7 @@ <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="row-auto-repeat-auto-003-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> +<link rel="stylesheet" href="/fonts/ahem.css"> <style> .masonry { display: masonry; @@ -12,11 +13,12 @@ masonry-direction: row; grid-template-rows: repeat(auto-fill, auto); width: 200px; - height: 400px; + height: 360px; + font: 15px/1 Ahem; } .masonry > div { - width: 50px; + width: min-content; height: 75%; } </style> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-023-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-023-ref.html @@ -4,8 +4,10 @@ .grid { display: grid; grid-auto-flow: column; - grid-template-rows: auto; + grid-template-rows: auto auto auto; + grid-template-columns: auto auto; height: 400px; + width: 240px; gap: 10px; } @@ -17,11 +19,11 @@ img { } </style> <div class="grid"> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> </div> </html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-023.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-023.html @@ -22,11 +22,11 @@ img { } </style> <div class="masonry"> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> </div> </html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-024-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-024-ref.html @@ -1,27 +0,0 @@ -<!DOCTYPE html> -<html> -<style> -.grid { - display: grid; - grid-auto-flow: column; - grid-template-rows: auto; - height: 400px; - width: 150px; - gap: 10px; -} - -img { - height: 100%; - width: auto; - display: block; -} -</style> -<div class="grid"> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> -</div> -</html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-024.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-024.html @@ -3,7 +3,7 @@ <title>Auto repeat tracks with fixed size and replaced items</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> -<link rel="match" href="row-auto-repeat-auto-024-ref.html"> +<link rel="match" href="row-auto-repeat-auto-023-ref.html"> <style> .masonry { display: masonry; @@ -21,11 +21,11 @@ img { } </style> <div class="masonry"> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> </div> </html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-027-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-027-ref.html @@ -4,7 +4,8 @@ .grid { display: grid; grid-auto-flow: column; - grid-template-rows: auto; + grid-template-rows: auto auto auto; + grid-template-columns: auto auto; height: 400px; width: 150px; gap: 10px; @@ -18,11 +19,11 @@ img { } </style> <div class="grid"> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> </div> </html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-027.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-027.html @@ -22,11 +22,11 @@ img { } </style> <div class="masonry"> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> - <img src="resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> + <img src="../../../resources/pink-image.png" width="113" height="120"></img> </div> </html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-fit-content-002-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-fit-content-002-ref.html @@ -6,7 +6,7 @@ display: grid; background: gray; grid-template-rows: repeat(7, fit-content(100px)); - grid-template-columns: repeat(4, auto); + grid-template-columns: auto; width: 300px; height: 300px; font: 15px/1 Ahem; @@ -14,6 +14,7 @@ .grid > div { width: 100px; + height: min-content; } </style> <body> @@ -21,19 +22,19 @@ <div style="background: lightskyblue;"> Number 1 </div> - <div style="background: lightcoral; grid-row: 2;"> + <div style="background: lightcoral;"> Number 2 </div> <div style="background: lightgreen;"> Number 3 </div> - <div style="background: lightpink; grid-row: 2;"> + <div style="background: lightpink;"> Number 4 </div> <div style="background: orange;"> Number 5 </div> - <div style="grid-row: span 2; background: brown; height: 100%;"> + <div style="grid-row: span 2; background: brown; height: 200%;"> Number 6 </div> </div> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-max-content-002-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-max-content-002-ref.html @@ -1,41 +0,0 @@ -<!DOCTYPE html> -<html> -<link rel="stylesheet" href="/fonts/ahem.css"> -<style> -.grid { - display: grid; - background: gray; - grid-template-rows: repeat(2, max-content); - grid-template-columns: repeat(4, auto); - width: 300px; - height: 300px; - font: 15px/1 Ahem; -} - -.grid > div { - width: 100px; -} -</style> -<body> - <div class="grid"> - <div style="background: lightskyblue;"> - Number 1 - </div> - <div style="background: lightcoral; grid-row: 2;"> - Number 2 - </div> - <div style="background: lightgreen;"> - Number 3 - </div> - <div style="background: lightpink; grid-row: 2;"> - Number 4 - </div> - <div style="background: orange;"> - Number 5 - </div> - <div style="grid-row: span 2; background: brown; height: 100%;"> - Number 6 - </div> - </div> -</body> -</html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-max-content-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-max-content-002.html @@ -2,7 +2,7 @@ <html> <title>Auto repeat tracks with max-content track size and % spanner</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link rel="match" href="row-auto-repeat-max-content-002-ref.html"> +<link rel="match" href="row-auto-repeat-fit-content-002-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="stylesheet" href="/fonts/ahem.css"> <style> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-min-content-002-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-min-content-002-ref.html @@ -1,41 +0,0 @@ -<!DOCTYPE html> -<html> -<link rel="stylesheet" href="/fonts/ahem.css"> -<style> -.grid { - display: grid; - background: gray; - grid-template-rows: repeat(2, min-content); - grid-template-columns: repeat(4, auto); - width: 300px; - height: 300px; - font: 15px/1 Ahem; -} - -.grid > div { - width: 100px; -} -</style> -<body> - <div class="grid"> - <div style="background: lightskyblue;"> - Number 1 - </div> - <div style="background: lightcoral; grid-row: 2;"> - Number 2 - </div> - <div style="background: lightgreen;"> - Number 3 - </div> - <div style="background: lightpink; grid-row: 2;"> - Number 4 - </div> - <div style="background: orange;"> - Number 5 - </div> - <div style="grid-row: span 2; background: brown; height: 100%;"> - Number 6 - </div> - </div> -</body> -</html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-min-content-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-min-content-002.html @@ -2,7 +2,7 @@ <html> <title>Auto repeat tracks with min-content track size and % spanner</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link rel="match" href="row-auto-repeat-min-content-002-ref.html"> +<link rel="match" href="row-auto-repeat-fit-content-002-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="stylesheet" href="/fonts/ahem.css"> <style>