commit 7f6845bb71061c632ed974ef5e9cc15df5b64d1c parent fd5246d45707000a9670a7585c985f2ffcbc96d0 Author: Alison Maher <almaher@microsoft.com> Date: Thu, 9 Oct 2025 16:27:55 +0000 Bug 1991145 [wpt PR 55103] - [Masonry] Update all wpts to use 'display:masonry' as the switch, a=testonly Automatic update from web-platform-tests [Masonry] Update all wpts to use 'display:masonry' as the switch The name is likely to change at some point soon, but this gets the tests in closer alignment with the current spec. [1] Note that external/wpt/css/css-grid/masonry/tentative/parsing was removed completely since the only test in that folder was no longer relevant. [1] https://github.com/w3c/csswg-drafts/issues/12022#issuecomment-3200131437 Bug: 343257585 Change-Id: If2e31428d27c06bb3790970892bfc1262275fa96 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6985918 Commit-Queue: Alison Maher <almaher@microsoft.com> Reviewed-by: Kurt Catti-Schmidt <kschmi@microsoft.com> Cr-Commit-Position: refs/heads/main@{#1521394} -- wpt-commits: 9da2f5df57761d2c8de6da40e8a2c4b29cc13048 wpt-pr: 55103 Diffstat:
81 files changed, 19 insertions(+), 255 deletions(-)
diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-align-content-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-align-content-001.html @@ -20,11 +20,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,20px); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-align-content-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-align-content-002.html @@ -19,11 +19,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,20px); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-align-content-003.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-align-content-003.html @@ -20,11 +20,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,auto); background: content-box silver; border: 1px solid; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-align-content-004.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-align-content-004.html @@ -19,11 +19,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,20px); background: content-box silver; border: 1px solid; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-justify-content-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-justify-content-001.html @@ -19,11 +19,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,20px); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-justify-content-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-justify-content-002.html @@ -19,11 +19,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,20px); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-justify-content-003.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-justify-content-003.html @@ -19,11 +19,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,20px); background: content-box silver; border: 1px solid; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-justify-content-004.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/alignment/masonry-justify-content-004.html @@ -19,11 +19,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,20px); background: content-box silver; border: 1px solid; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001.html @@ -17,15 +17,14 @@ html,body { .grid { float: left; - display: grid; display: masonry; - grid: masonry / repeat(4, auto); + grid: none / repeat(4, auto); border: 2px solid; padding: 1px; margin: 1px; } .c { - grid: repeat(4, auto) / masonry; + grid: repeat(4, auto) / none; masonry-direction: row; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001.html @@ -17,16 +17,15 @@ body { width:600px; height:600px; border:1px solid; box-sizing:border-box; } .grid { float: left; - display: grid; display: masonry; - grid: masonry / repeat(4, auto); + grid: none / repeat(4, auto); place-items: start; padding-block-start: 1px; margin-left: 1px; border:1px solid; } .c { - grid: repeat(4, auto) / masonry; + grid: repeat(4, auto) / none; masonry-direction: row; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html @@ -17,9 +17,8 @@ body { width:600px; height:600px; border:1px solid; box-sizing:border-box; } .grid { float: left; - display: grid; display: masonry; - grid: masonry / repeat(4, auto); + grid: none / repeat(4, auto); place-items: start; padding-block-start: 1px; margin-left: 1px; @@ -28,7 +27,7 @@ body { width:600px; height:600px; border:1px solid; box-sizing:border-box; } width: 100px; } .c { - grid: repeat(4, auto) / masonry; + grid: repeat(4, auto) / none; masonry-direction: row; } .ae { align-content: end; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html @@ -17,9 +17,8 @@ body { width:600px; height:600px; border:1px solid; box-sizing:border-box; } .grid { float: left; - display: grid; display: masonry; - grid: masonry / repeat(4, auto); + grid: none / repeat(4, auto); place-items: start; padding-block-start: 1px; margin-left: 1px; @@ -28,7 +27,7 @@ body { width:600px; height:600px; border:1px solid; box-sizing:border-box; } width: 100px; } .c { - grid: repeat(4, auto) / masonry; + grid: repeat(4, auto) / none; masonry-direction: row; } .ae { align-content: end; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001.html @@ -31,10 +31,8 @@ wrapper { background-color: rgba(10,100,10,.5); } .grid { - display: grid; display: masonry; grid-template-columns: 10px 15px 20px; - grid-template-rows: masonry; border: 1px solid; gap: 2px; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002.html @@ -31,10 +31,8 @@ wrapper { background-color: rgba(10,100,10,.5); } .grid { - display: grid; display: masonry; grid-template-columns: 10px 15px 20px; - grid-template-rows: masonry; border: 1px solid; gap: 2px; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003.html @@ -28,10 +28,9 @@ wrapper { } .grid { - display: grid; display: masonry; masonry-direction: row; - grid: 20px auto 30px / masonry; + grid: 20px auto 30px / none; border: solid; border-width: 3px 1px 7px 5px; padding: 1px 3px 5px 7px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html @@ -15,11 +15,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 10px 20px; grid-template-columns: repeat(4,auto); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-002.html @@ -22,10 +22,8 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; grid-template-columns: repeat(4,auto); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001.html @@ -14,12 +14,10 @@ body,html { color:black; background:white; font-size:15px/1 monospace; padding:0; margin:0; } .grid { - display: grid; display: masonry; position: relative; border: 1px solid; grid-template-columns: [A-start] 60px 60px 60px; - grid-template-rows: masonry; grid-template-areas: "B A"; grid-auto-columns: 40px; grid-gap: 1px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html @@ -14,12 +14,10 @@ body,html { color:black; background:white; font:15px/1 monospace; padding:0; margin:0; } .grid { - display: grid; display: masonry; position: relative; border: 1px solid; grid-template-columns: [A-start] 60px 60px 60px; - grid-template-rows: masonry; grid-template-areas: "B A"; grid-auto-columns: 40px; grid-auto-flow: dense; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-001-auto.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-001-auto.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,auto); - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-001-fr.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-001-fr.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: 1fr 2fr 1fr 1fr; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-001-mix1.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-001-mix1.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: 1fr 2fr min-content max-content; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-001-mix2.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-001-mix2.html @@ -14,12 +14,10 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; /* keep fixed values small enough for spanners to have an effect */ grid-template-columns: 1.1ch auto 1.4ch 1fr; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-002-auto.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-002-auto.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,auto); - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-002-fr.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-002-fr.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: 1fr 2fr 1fr 1fr; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-002-mix1.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-002-mix1.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: 1fr 2fr min-content max-content; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-002-mix2.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-002-mix2.html @@ -14,12 +14,10 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; /* keep fixed values small enough for spanners to have an effect */ grid-template-columns: 1.1ch auto 1.4ch 1fr; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-003-auto.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-003-auto.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,auto); - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-003-fr.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-003-fr.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; - display: inline-grid; + display: inline-masonry; gap: 1px 2px; grid-template-columns: 1fr 2fr 1fr 1fr; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-003-mix1.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-003-mix1.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: 1fr 2fr min-content max-content; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-003-mix2.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-003-mix2.html @@ -14,12 +14,10 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; /* keep fixed values small enough for spanners to have an effect */ grid-template-columns: 1.1ch auto 1.4ch 1fr; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-004-auto.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-004-auto.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,auto); - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-004-fr.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-004-fr.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: 1fr 2fr 1fr 1fr; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-004-mix1.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-004-mix1.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: 1fr 2fr min-content max-content; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-004-mix2.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-004-mix2.html @@ -14,12 +14,10 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; /* keep fixed values small enough for spanners to have an effect */ grid-template-columns: 1.1ch auto 1.4ch 1fr; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-005.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-005.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,auto); - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-006.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-006.html @@ -14,10 +14,8 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-007.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-007.html @@ -14,10 +14,8 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; - grid-template-rows: masonry; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-001-auto.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-001-auto.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,auto); border: 1px solid; padding: 0 1px 0 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-001-fr.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-001-fr.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: 1fr 2fr 1fr 1fr; border: 1px solid; padding: 0 1px 0 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-001-mix1.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-001-mix1.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: 1fr 2fr min-content max-content; border: 1px solid; padding: 0 1px 0 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-001-mix2.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-001-mix2.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; /* keep fixed values small enough for spanners to have an effect */ grid-template-rows: 1.1ch auto 1.4ch 1fr; border: 1px solid; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-002-auto.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-002-auto.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,auto); border: 1px solid; padding: 0 1px 0 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-002-fr.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-002-fr.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: 1fr 2fr 1fr 1fr; border: 1px solid; padding: 0 1px 0 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-002-mix1.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-002-mix1.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: 1fr 2fr min-content max-content; border: 1px solid; padding: 0 1px 0 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-002-mix2.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-002-mix2.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; /* keep fixed values small enough for spanners to have an effect */ grid-template-rows: 1.1ch auto 1.4ch 1fr; border: 1px solid; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-auto.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-auto.html @@ -15,11 +15,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,auto); border: 1px solid; padding: 1px 0 2px 0; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-fr.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-fr.html @@ -15,11 +15,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: 1fr 2fr 1fr 1fr; border: 1px solid; padding: 1px 0 2px 0; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-mix1.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-mix1.html @@ -15,11 +15,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: 1fr 2fr min-content max-content; border: 1px solid; padding: 1px 0 2px 0; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-mix2.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-mix2.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; /* keep fixed values small enough for spanners to have an effect */ grid-template-rows: 1.1ch auto 1.4ch 1fr; border: 1px solid; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-auto.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-auto.html @@ -15,11 +15,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,auto); border: 1px solid; padding: 1px 0 2px 0; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-fr.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-fr.html @@ -15,10 +15,8 @@ grid { display: inline-grid; - display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: 1fr 2fr 1fr 1fr; border: 1px solid; padding: 1px 0 2px 0; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-mix1.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-mix1.html @@ -15,11 +15,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: 1fr 2fr min-content max-content; border: 1px solid; padding: 1px 0 2px 0; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-mix2.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-mix2.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; /* keep fixed values small enough for spanners to have an effect */ grid-template-rows: 1.1ch auto 1.4ch 1fr; border: 1px solid; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-005.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-005.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,auto); border: 1px solid; padding: 0 1px 0 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-006.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-006.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; gap: 1px 2px; - grid-template-columns: masonry; grid-template-rows: repeat(4,auto); border: 1px solid; padding: 0 1px 0 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-007.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-007.html @@ -14,11 +14,9 @@ @import "support/masonry-intrinsic-sizing-visual.css"; grid { - display: grid; display: masonry; masonry-direction: row; gap: 1rem 1rem; - grid-template-columns: masonry; grid-template-rows: repeat(4,100px); border: 1px solid; padding: 0 1px 0 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001.html @@ -15,11 +15,9 @@ } grid { - display: inline-grid; display: inline-masonry; gap: 10px 20px; grid-template-columns: repeat(4,80px); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002.html @@ -15,11 +15,9 @@ } grid { - display: inline-grid; display: inline-masonry; gap: 10px 20px; grid-auto-columns: 80px; - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003.html @@ -15,12 +15,10 @@ } grid { - display: inline-grid; display: inline-masonry; gap: 10px 20px; grid-auto-flow: dense; grid-auto-columns: 80px; - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html @@ -15,11 +15,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,20px); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html @@ -15,11 +15,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,20px); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html @@ -15,11 +15,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,20px); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html @@ -15,11 +15,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 1px 2px; grid-template-columns: repeat(4,20px); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008.html @@ -10,9 +10,7 @@ <body> <style> grid { - display: inline-grid; display: inline-masonry; - grid-template-rows: masonry; grid-template-columns: repeat( auto-fill, minmax(200px, 400px) ); gap: 30px; max-width: 50vw; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed.html @@ -9,9 +9,7 @@ <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> grid { - display: grid; display: masonry; - grid-template-rows: masonry; grid-template-columns: auto; grid-gap: 10px; font-family: Ahem; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-columns-item-containing-block-is-grid-content-width.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-columns-item-containing-block-is-grid-content-width.html @@ -7,9 +7,7 @@ <meta name="assert" content="Test passes if SVG uses grid's content logical width for its containing block size and get sized to 100px x 100px"> <style> grid { - display: grid; display: masonry; - grid-template-columns:masonry; grid-template-rows: auto; masonry-direction: row; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html @@ -10,9 +10,7 @@ <script src="/css/support/computed-testcommon.js"></script> <style> #target { - display: grid; display: masonry; - grid-template-rows: masonry; font-size: 40px; min-width: 200px; width: 300px; @@ -38,7 +36,7 @@ </div> </div> <script> - test_computed_value("grid-template-rows", 'masonry', 'masonry'); + test_computed_value("grid-template-rows", 'none', 'none'); test_computed_value("grid-template-columns", 'none', 'none'); // "none" without #child // track-size <fixed-breadth> = <length-percentage> | <flex> | min-content | max-content | auto diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-not-inhibited-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-not-inhibited-001.html @@ -7,10 +7,8 @@ <style> grid { vertical-align: top; - display: inline-grid; display: inline-masonry; grid-template-columns: 60px 60px; - grid-template-rows: masonry; border: 2px solid black; } .overflowSet { diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/order/masonry-order-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/order/masonry-order-001.html @@ -16,11 +16,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; gap: 10px 20px; grid-template-columns: repeat(4,auto); - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html @@ -1,78 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<meta charset="utf-8"> -<title>CSS Masonry Test: parsing properties and shortands</title> -<link rel="help" href="https://drafts.csswg.org/css-grid-3/#grid-template-masonry"> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="/css/support/parsing-testcommon.js"></script> -<script src="/css/support/shorthand-testcommon.js"></script> -</head> -<body> -<script> -function masonry_test_template_prop(name) { - test_valid_value(name, 'masonry'); - test_invalid_value(name, 'masonry []'); - test_invalid_value(name, 'masonry [foo] 40px'); - test_invalid_value(name, 'masonry 40px'); - test_invalid_value(name, '[foo] masonry'); - test_invalid_value(name, '0px masonry'); - test_invalid_value(name, 'masonry masonry'); - test_invalid_value(name, 'subgrid masonry'); - test_invalid_value(name, 'masonry subgrid'); - test_invalid_value(name, 'masonry repeat(1, [])'); - test_invalid_value(name, 'masonry repeat(auto-fill, [])'); - test_invalid_value(name, 'masonry / none'); -} -masonry_test_template_prop("grid-template-columns"); -masonry_test_template_prop("grid-template-rows"); - -test_shorthand_value("grid-template", 'masonry / masonry', { - 'grid-template-rows': 'masonry', - 'grid-template-columns': 'masonry', - 'grid-template-areas': 'none' -}); - -test_shorthand_value("grid-template", 'masonry / subgrid [foo]', { - 'grid-template-rows': 'masonry', - 'grid-template-columns': 'subgrid [foo]', - 'grid-template-areas': 'none' -}); - -test_shorthand_value("grid-template", '10px / masonry', { - 'grid-template-rows': '10px', - 'grid-template-columns': 'masonry', - 'grid-template-areas': 'none' -}); - -test_shorthand_value("grid", 'masonry / masonry', { - 'grid-template-rows': 'masonry', - 'grid-template-columns': 'masonry', - 'grid-template-areas': 'none', - 'grid-auto-rows': 'auto', - 'grid-auto-columns': 'auto', - 'grid-auto-flow': 'row' -}); - -test_shorthand_value("grid", 'masonry / subgrid [foo]', { - 'grid-template-rows': 'masonry', - 'grid-template-columns': 'subgrid [foo]', - 'grid-template-areas': 'none', - 'grid-auto-rows': 'auto', - 'grid-auto-columns': 'auto', - 'grid-auto-flow': 'row' -}); - -test_shorthand_value("grid", '10px / masonry', { - 'grid-template-rows': '10px', - 'grid-template-columns': 'masonry', - 'grid-template-areas': 'none', - 'grid-auto-rows': 'auto', - 'grid-auto-columns': 'auto', - 'grid-auto-flow': 'row' -}); - -</script> -</body> -</html> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001.html @@ -15,11 +15,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; grid-template-rows: 50px 80px 40px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -28,7 +26,6 @@ grid { } .rows { grid-template-columns: 50px 80px 40px; - grid-template-rows: masonry; } item { background: grey; @@ -56,8 +53,7 @@ subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> -<grid style="grid:masonry/masonry"> +<grid> <item>1</item> <item>2</item> <item>3</item> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002.html @@ -15,11 +15,9 @@ html,body { } grid { - display: inline-grid; display: inline-masonry; masonry-direction: row; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -29,7 +27,6 @@ grid { .rows { masonry-direction: column; grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; } item { background: grey; @@ -124,7 +121,7 @@ subgrid.extent { <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: subgrid / masonry"> + <subgrid style="grid: subgrid / none"> <item>4a</item> <item>4b</item> <item>4c</item> @@ -135,7 +132,7 @@ subgrid.extent { <!-- ... unless it's auto-placed in the first track ... --> <grid> <item>1</item> - <subgrid style="grid: subgrid / masonry"> + <subgrid style="grid: subgrid / none"> <item>4a</item> <item>4b</item> <item>4c</item> @@ -241,7 +238,7 @@ subgrid.extent { <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: masonry / subgrid"> + <subgrid style="grid: none / subgrid"> <item>4a</item> <item>4b</item> <item>4c</item> @@ -252,7 +249,7 @@ subgrid.extent { <!-- ... unless it's auto-placed in the first track ... --> <grid class="rows"> <item>1</item> - <subgrid style="grid: masonry / subgrid"> + <subgrid style="grid: none / subgrid"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/track-sizing/masonry-subgrid-flex.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/track-sizing/masonry-subgrid-flex.html @@ -12,10 +12,8 @@ <link rel="match" href="masonry-subgrid-flex-ref.html"> <style> grid { - display: inline-grid; display: inline-masonry; grid-template-columns: 1fr 2fr 3fr; - grid-template-rows: masonry; border: 1px solid; background: lightgrey; } @@ -77,7 +75,7 @@ <!-- Verify behavior when subgrid is set to masonry too --> <grid> <item>1</item> - <subgrid style="grid-template-rows: masonry; display: masonry;"> + <subgrid style="display: masonry;"> <item>2</item> <item style="width: 3ch">3</item> <item>4</item> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/track-sizing/masonry-subgrid-intrinsic-sizing.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/track-sizing/masonry-subgrid-intrinsic-sizing.html @@ -12,10 +12,8 @@ <link rel="match" href="masonry-subgrid-intrinsic-sizing-ref.html"> <style> grid { - display: inline-grid; display: inline-masonry; grid-template-columns: auto min-content max-content; - grid-template-rows: masonry; border: 1px solid; background: lightgrey; } @@ -77,7 +75,7 @@ <!-- Verify behavior when subgrid is set to masonry too --> <grid> <item>1</item> - <subgrid style="grid-template-rows: masonry; display: masonry;"> + <subgrid style="display: masonry;"> <item>2</item> <item style="width: 3ch">3</item> <item>4</item> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/track-sizing/masonry-subgrid.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/subgrid/track-sizing/masonry-subgrid.html @@ -12,10 +12,8 @@ <link rel="match" href="masonry-subgrid-ref.html"> <style> grid { - display: inline-grid; display: inline-masonry; grid-template-columns: 50px 100px 200px; - grid-template-rows: masonry; border: 1px solid; background: lightgrey; } @@ -77,7 +75,7 @@ <!-- Verify behavior when subgrid is set to masonry too --> <grid> <item>1</item> - <subgrid style="grid-template-rows: masonry; display: masonry;"> + <subgrid style="display: masonry;"> <item>2</item> <item style="width: 3ch">3</item> <item>4</item> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize.html @@ -12,9 +12,7 @@ <style> grid { - display: inline-grid; display: inline-masonry; - grid-template-rows: masonry; grid-template-columns: auto; grid-gap: 10px; border: 10px; diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block.html @@ -12,10 +12,8 @@ <body> <style> grid { - display: grid; display: masonry; grid-template-columns: 100px 1fr; - grid-template-rows: masonry; width: 300px; height: 100px; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side.html @@ -12,10 +12,8 @@ <body> <style> grid { - display: grid; display: masonry; grid-template-columns: auto 1fr; - grid-template-rows: masonry; width: 300px; height: 100px; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side.html @@ -12,10 +12,8 @@ <body> <style> grid { - display: grid; display: masonry; grid-template-columns: 1fr auto; - grid-template-rows: masonry; width: 300px; height: 100px; } diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row.html @@ -12,10 +12,8 @@ <body> <style> grid { - display: grid; display: masonry; grid-template-columns: 50px 1fr; - grid-template-rows: masonry; width: 300px; height: 100px; }