[css-grid][masonry] Update tests to align with intrinsic track sizing behavior (#45669)
Updating masonry tests to ensure intrinsic tracks are the same size.
diff --git a/css/css-grid/masonry/tentative/align-content/masonry-align-content-003-ref.html b/css/css-grid/masonry/tentative/align-content/masonry-align-content-003-ref.html
index 9780d5f..9da15c0 100644
--- a/css/css-grid/masonry/tentative/align-content/masonry-align-content-003-ref.html
+++ b/css/css-grid/masonry/tentative/align-content/masonry-align-content-003-ref.html
@@ -8,31 +8,31 @@
<title>Reference: Masonry layout with `align-content` in grid axis</title>
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<style>
-html,body {
- color:black; background-color:white; font:15px/1 monospace; padding:0; margin:0;
-}
+ html,body {
+ color:black; background-color:white; font:15px/1 monospace; padding:0; margin:0;
+ }
-grid {
- display: inline-grid;
- gap: 1px 2px;
- grid-template-columns: 1ch auto;
- grid-template-rows: repeat(4,auto);
- background: content-box silver;
- border: 1px solid;
- padding: 0 3px 2px 0;
- width: 100px;
- height: 120px;
- align-content: center;
- justify-items: start;
-}
+ grid {
+ display: inline-grid;
+ gap: 1px 2px;
+ grid-template-columns: 1ch auto;
+ grid-template-rows: repeat(4,19px);
+ background: content-box silver;
+ border: 1px solid;
+ padding: 0 3px 2px 0;
+ width: 100px;
+ height: 120px;
+ align-content: center;
+ justify-items: start;
+ }
-item {
- background-color: #444;
- color: #fff;
-}
+ item {
+ background-color: #444;
+ color: #fff;
+ }
-.tall { grid-row: span 2; padding: 3px 11px 1px 13px; }
-</style>
+ .tall { grid-row: span 2; padding: 3px 11px 1px 13px; }
+ </style>
</head>
<body>
@@ -90,7 +90,7 @@
<item style="grid-row:3/4">6</item>
</grid>
-<grid style="align-content:stretch">
+<grid style="align-content:stretch; grid-template-rows: repeat(4,29.25px);">
<item class="tall" style="grid-row:1/2">1</item>
<item style="grid-row:2/3">2</item>
<item style="grid-row:3/4">3</item>
diff --git a/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html b/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html
index b36efb6..a799955 100644
--- a/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html
+++ b/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html
@@ -1,34 +1,34 @@
<!DOCTYPE html>
<html>
<head>
-<meta charset="utf-8">
-<title>CSS Masonry Test: getComputedStyle().gridTemplateColumns</title>
-<link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-template-columns">
-<meta name="assert" content="grid-template-columns computed value is the keyword none or a computed track list.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/computed-testcommon.js"></script>
-<style>
- #target {
- display: grid;
- grid-template-rows: masonry;
- font-size: 40px;
- min-width: 200px;
- width: 300px;
- max-width: 400px;
- min-height: 500px;
- height: 600px;
- max-height: 700px;
- }
- #child {
- min-width: 20px;
- width: 30px;
- max-width: 40px;
- min-height: 50px;
- height: 60px;
- max-height: 70px;
- }
-</style>
+ <meta charset="utf-8">
+ <title>CSS Masonry Test: getComputedStyle().gridTemplateColumns</title>
+ <link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-template-columns">
+ <meta name="assert" content="grid-template-columns computed value is the keyword none or a computed track list.">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ <script src="/css/support/computed-testcommon.js"></script>
+ <style>
+ #target {
+ display: grid;
+ grid-template-rows: masonry;
+ font-size: 40px;
+ min-width: 200px;
+ width: 300px;
+ max-width: 400px;
+ min-height: 500px;
+ height: 600px;
+ max-height: 700px;
+ }
+ #child {
+ min-width: 20px;
+ width: 30px;
+ max-width: 40px;
+ min-height: 50px;
+ height: 60px;
+ max-height: 70px;
+ }
+ </style>
</head>
<body>
<div id="container">
@@ -37,59 +37,59 @@
</div>
</div>
<script>
-test_computed_value("grid-template-rows", 'masonry', 'masonry');
-test_computed_value("grid-template-columns", 'none', 'none'); // "none" without #child
+ test_computed_value("grid-template-rows", 'masonry', 'masonry');
+ test_computed_value("grid-template-columns", 'none', 'none'); // "none" without #child
-// track-size <fixed-breadth> = <length-percentage> | <flex> | min-content | max-content | auto
-test_computed_value("grid-template-columns", '20%', '60px'); // 20% * width
-test_computed_value("grid-template-columns", 'calc(-0.5em + 10px)', '0px');
-test_computed_value("grid-template-columns", 'calc(0.5em + 10px)', '30px');
-test_computed_value("grid-template-columns", 'calc(30% + 40px)', '130px'); // 30% * width + 40px
-test_computed_value("grid-template-columns", '5fr', '300px'); // width
-test_computed_value("grid-template-columns", 'min-content', '30px');
-test_computed_value("grid-template-columns", 'max-content', '30px');
-test_computed_value("grid-template-columns", 'auto', '300px'); // width
+ // track-size <fixed-breadth> = <length-percentage> | <flex> | min-content | max-content | auto
+ test_computed_value("grid-template-columns", '20%', '60px'); // 20% * width
+ test_computed_value("grid-template-columns", 'calc(-0.5em + 10px)', '0px');
+ test_computed_value("grid-template-columns", 'calc(0.5em + 10px)', '30px');
+ test_computed_value("grid-template-columns", 'calc(30% + 40px)', '130px'); // 30% * width + 40px
+ test_computed_value("grid-template-columns", '5fr', '300px'); // width
+ test_computed_value("grid-template-columns", 'min-content', '30px');
+ test_computed_value("grid-template-columns", 'max-content', '30px');
+ test_computed_value("grid-template-columns", 'auto', '300px'); // width
-// track-size minmax( <inflexible-breadth> , <track-breadth> )
-test_computed_value("grid-template-columns", 'minmax(10px, auto)', '300px'); // width
-test_computed_value("grid-template-columns", 'minmax(20%, max-content)', '60px'); // 20% * width
-test_computed_value("grid-template-columns", 'minmax(min-content, calc(-0.5em + 10px))', '30px');
-test_computed_value("grid-template-columns", 'minmax(auto, 0)', '30px');
+ // track-size minmax( <inflexible-breadth> , <track-breadth> )
+ test_computed_value("grid-template-columns", 'minmax(10px, auto)', '300px'); // width
+ test_computed_value("grid-template-columns", 'minmax(20%, max-content)', '60px'); // 20% * width
+ test_computed_value("grid-template-columns", 'minmax(min-content, calc(-0.5em + 10px))', '30px');
+ test_computed_value("grid-template-columns", 'minmax(auto, 0)', '30px');
-// track-size fit-content( <length-percentage> )
-test_computed_value("grid-template-columns", 'fit-content(70px)', '30px');
-test_computed_value("grid-template-columns", 'fit-content(20%)', '30px');
-test_computed_value("grid-template-columns", 'fit-content(calc(-0.5em + 10px))', '30px');
+ // track-size fit-content( <length-percentage> )
+ test_computed_value("grid-template-columns", 'fit-content(70px)', '30px');
+ test_computed_value("grid-template-columns", 'fit-content(20%)', '30px');
+ test_computed_value("grid-template-columns", 'fit-content(calc(-0.5em + 10px))', '30px');
-// <track-repeat> = repeat( [ <positive-integer> ] , [ <line-names>? <track-size> ]+ <line-names>? )
-test_computed_value("grid-template-columns", 'repeat(1, 10px)', '10px');
-test_computed_value("grid-template-columns", 'repeat(1, [one two] 20%)', '[one two] 60px');
-test_computed_value("grid-template-columns", 'repeat(2, minmax(10px, auto))', '160px 140px');
+ // <track-repeat> = repeat( [ <positive-integer> ] , [ <line-names>? <track-size> ]+ <line-names>? )
+ test_computed_value("grid-template-columns", 'repeat(1, 10px)', '10px');
+ test_computed_value("grid-template-columns", 'repeat(1, [one two] 20%)', '[one two] 60px');
+ test_computed_value("grid-template-columns", 'repeat(2, minmax(10px, auto))', '150px 150px');
-test_computed_value("grid-template-columns", 'repeat(2, fit-content(20%) [three four] 30px 40px [five six])',
- '30px [three four] 30px 40px [five six] 0px [three four] 30px 40px [five six]');
+ test_computed_value("grid-template-columns", 'repeat(2, fit-content(20%) [three four] 30px 40px [five six])',
+ '30px [three four] 30px 40px [five six] 30px [three four] 30px 40px [five six]');
-// <track-list> = [ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?
-test_computed_value("grid-template-columns", 'min-content repeat(5, minmax(10px, auto))',
- '30px 54px 54px 54px 54px 54px');
-test_computed_value("grid-template-columns", '[] 150px [] 1fr []', '150px 150px');
+ // <track-list> = [ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?
+ test_computed_value("grid-template-columns", 'min-content repeat(5, minmax(10px, auto))',
+ '30px 54px 54px 54px 54px 54px');
+ test_computed_value("grid-template-columns", '[] 150px [] 1fr []', '150px 150px');
-// <auto-repeat> = repeat( [ auto-fill | auto-fit ] , [ <line-names>? <fixed-size> ]+ <line-names>? )
-test_computed_value("grid-template-columns", 'repeat(auto-fill, 200px)', '200px');
-test_computed_value("grid-template-columns", 'repeat(auto-fit, [one] 20%)',
- '[one] 60px [one] 60px [one] 60px [one] 60px [one] 60px');
-test_computed_value("grid-template-columns", 'repeat(auto-fill, minmax(100px, 5fr) [two])',
- '100px [two] 100px [two] 100px [two]');
-test_computed_value("grid-template-columns", 'repeat(auto-fit, [three] minmax(max-content, 6em) [four])',
- '[three] 240px [four]');
+ // <auto-repeat> = repeat( [ auto-fill | auto-fit ] , [ <line-names>? <fixed-size> ]+ <line-names>? )
+ test_computed_value("grid-template-columns", 'repeat(auto-fill, 200px)', '200px');
+ test_computed_value("grid-template-columns", 'repeat(auto-fit, [one] 20%)',
+ '[one] 60px [one] 60px [one] 60px [one] 60px [one] 60px');
+ test_computed_value("grid-template-columns", 'repeat(auto-fill, minmax(100px, 5fr) [two])',
+ '100px [two] 100px [two] 100px [two]');
+ test_computed_value("grid-template-columns", 'repeat(auto-fit, [three] minmax(max-content, 6em) [four])',
+ '[three] 240px [four]');
-// <auto-track-list> =
-// [ <line-names>? [ <fixed-size> | <fixed-repeat> ] ]* <line-names>?
-// <auto-repeat>
-// [ <line-names>? [ <fixed-size> | <fixed-repeat> ] ]* <line-names>?
+ // <auto-track-list> =
+ // [ <line-names>? [ <fixed-size> | <fixed-repeat> ] ]* <line-names>?
+ // <auto-repeat>
+ // [ <line-names>? [ <fixed-size> | <fixed-repeat> ] ]* <line-names>?
-test_computed_value("grid-template-columns", '[one] repeat(2, minmax(50px, auto)) [two] 30px [three] repeat(auto-fill, 10px) 40px [four five] repeat(2, minmax(200px, auto)) [six]',
- '[one] 50px 50px [two] 30px [three] 10px 40px [four five] 200px 200px [six]');
+ test_computed_value("grid-template-columns", '[one] repeat(2, minmax(50px, auto)) [two] 30px [three] repeat(auto-fill, 10px) 40px [four five] repeat(2, minmax(200px, auto)) [six]',
+ '[one] 50px 50px [two] 30px [three] 10px 40px [four five] 200px 200px [six]');
</script>
</body>
</html>
