Update web-platform-tests to revision b'1d9b01e2fad6af3a057d571b1e088e15fa9bc8e6'

5 files changed, 602 insertions, 2 deletions

diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-nogrid.html b/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-nogrid.html
index 11b0393a676..b1f80a728c4 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-nogrid.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-nogrid.html
@@ -26,6 +26,7 @@ test_computed_value("grid-template-columns", "1px repeat(1, 2px) 3px");
 test_computed_value("grid-template-columns", "1px repeat(auto-fill, 2px) 3px");
 test_computed_value("grid-template-columns", "1px repeat(auto-fit, 2px) 3px");
 test_computed_value("grid-template-columns", "1px [a] repeat(1, 2px 3px) [b] 4px");
+test_computed_value("grid-template-columns", "1px [a] repeat(2, 2px 3px) [b] 4px");
 test_computed_value("grid-template-columns", "1px [a] repeat(auto-fill, 2px 3px) [b] 4px");
 test_computed_value("grid-template-columns", "1px [a] repeat(auto-fit, 2px 3px) [b] 4px");
 test_computed_value("grid-template-columns", "1px [a] repeat(1, [b] 2px [c]) [d] 3px");
@@ -33,6 +34,8 @@ test_computed_value("grid-template-columns", "1px [a] repeat(auto-fill, [b] 2px
 test_computed_value("grid-template-columns", "1px [a] repeat(auto-fit, [b] 2px [c]) [d] 3px");
 test_computed_value("grid-template-columns", "[a] 1px repeat(1, 2px [b] 3px) 4px [d]");
 test_computed_value("grid-template-columns", "[a] 1px repeat(auto-fill, 2px [b] 3px) 4px [d]");
+test_computed_value("grid-template-columns", "[a] 1px 4px [d]");
+test_computed_value("grid-template-columns", "[a] 1px repeat(auto-fill, 2px [b] 3px) [d] 4px");
 test_computed_value("grid-template-columns", "[a] 1px repeat(auto-fit, 2px [b] 3px) 4px [d]");
 test_computed_value("grid-template-rows", "100% [a] repeat(1, [b] 200% [c]) [d] 300%");
 test_computed_value("grid-template-rows", "100% [a] repeat(auto-fill, [b] 200% [c]) [d] 300%");
@@ -40,4 +43,9 @@ test_computed_value("grid-template-rows", "100% [a] repeat(auto-fit, [b] 200% [c
 test_computed_value("grid-template-columns", "[a] 1em repeat(1, 2em [b] 3em) 4em [d]", "[a] 1px repeat(1, 2px [b] 3px) 4px [d]");
 test_computed_value("grid-template-columns", "[a] 1em repeat(auto-fill, 2em [b] 3em) 4em [d]", "[a] 1px repeat(auto-fill, 2px [b] 3px) 4px [d]");
 test_computed_value("grid-template-columns", "[a] 1em repeat(auto-fit, 2em [b] 3em) 4em [d]", "[a] 1px repeat(auto-fit, 2px [b] 3px) 4px [d]");
+test_computed_value("grid-template-columns", "repeat(1, 2px [a] 3px) [b] repeat(auto-fill, [c] 200% [d]) [e] 300%");
+test_computed_value("grid-template-columns", "[a] repeat(auto-fill, [b] 200% [c]) repeat(1, 2px [d] 3px) [e] 300%");
+test_computed_value("grid-template-columns", "repeat(1, [a] 2px [b] 3px) [b] repeat(auto-fill, [c] 200% [d]) [e] 300%");
+test_computed_value("grid-template-columns", "[a] repeat(auto-fill, [b] 200% [c]) repeat(1, 2px [d] 3px [e]) [f] 300%");
+test_computed_value("grid-template-columns", "[a] 1px [b c] repeat(auto-fill, [d] 200% [e f]) [g] 2px repeat(1, 3px [d e] 4px [e f]) [g] 300% [h]");
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-computed-nogrid.html b/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-computed-nogrid.html
index ccfe67a5c0f..1f37ce860ac 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-computed-nogrid.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-computed-nogrid.html
@@ -48,5 +48,22 @@ test_computed_value("grid-template-columns", "subgrid [a] repeat(auto-fill, [c]
 test_computed_value("grid-template-columns", "subgrid [a b] repeat(auto-fill, [c] [d e]) [g]");
 test_computed_value("grid-template-columns", "subgrid [a] [b] repeat(auto-fill, [c] [d e]) [g h]");
 test_computed_value("grid-template-columns", "subgrid [a] [b] repeat(auto-fill, [c] [d e])");
-
+test_computed_value("grid-template-columns", "subgrid [a] repeat(2, [c] [d e])");
+test_computed_value("grid-template-columns", "subgrid repeat(1, [])");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [])");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [a])");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [a] [])");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [] [a] [])");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [] [] []) repeat(auto-fill, [] [] [])");
+test_computed_value("grid-template-columns", "subgrid repeat(1, [a b])");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [a b])");
+test_computed_value("grid-template-columns", "subgrid repeat(1, [a] [b])");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [a] [b])");
+test_computed_value("grid-template-columns", "subgrid [a] repeat(2, [b])");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [a]) [b]");
+test_computed_value("grid-template-columns", "subgrid [a] repeat(2, [b] [c d]) [e]");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [a b]) repeat(auto-fill, [c] [d e])");
+test_computed_value("grid-template-columns", "subgrid repeat(auto-fill, [a] [b c]) repeat(2, [d e])");
+test_computed_value("grid-template-columns", "subgrid repeat(2, [a b]) repeat(auto-fill, [c] [d e]) repeat(2, [f g])");
+test_computed_value("grid-template-columns", "subgrid [a] [b c] repeat(2, [d e]) [f] [g h] repeat(auto-fill, [i] [j k]) [l] repeat(2, [m n]) [o]");
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005-ref.html b/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005-ref.html
new file mode 100644
index 00000000000..f8fa0ab81b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005-ref.html
@@ -0,0 +1,286 @@
+<!DOCTYPE HTML>
+<html><head>
+  <meta charset="utf-8">
+  <title>Reference: line names in orthogonal parent subgrid</title>
+  <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com">
+  <style>
+    body {
+      font:10px monospace; padding:0; margin:0; line-height:0;
+    }
+
+    .grid {
+      display: inline-grid;
+      grid-auto-columns: 15px;
+      border: 1px solid;
+      vertical-align: bottom;
+    }
+
+    .subgrid {
+      display: grid;
+      grid-template-columns: subgrid;
+      grid-column: 3 / span 4;
+      background: grey;
+    }
+    .grid > .subgrid > .subgrid {
+      writing-mode: vertical-lr;
+      grid-template-rows: subgrid;
+      grid-template-columns: initial;
+      grid-column: 1 / span 4;
+      grid-auto-columns: 8px;
+      grid-auto-flow: column;
+    }
+
+    .fill-1a  { grid-template-columns: subgrid repeat(auto-fill, [y]) [z] [z] [z] [z] }  /* [y] [z] [z] [z] [z] */
+    .fill-1b  { grid-template-columns: subgrid [x] repeat(auto-fill, [y]) [z] [z] [z] }  /* [x] [y] [z] [z] [z] */
+    .fill-1c  { grid-template-columns: subgrid [x] [x] repeat(auto-fill, [y]) [z] [z] }  /* [x] [x] [y] [z] [z] */
+    .fill-1d  { grid-template-columns: subgrid [x] [x] [x] repeat(auto-fill, [y]) [z] }  /* [x] [x] [x] [y] [z] */
+    .fill-1e  { grid-template-columns: subgrid [x] [x] [x] [x] repeat(auto-fill, [y]) }  /* [x] [x] [x] [x] [y] */
+
+    .areas-1a { grid-template-areas: 'x x x x' }
+    .areas-1b { grid-template-areas: '. x x x' }
+    .areas-1c { grid-template-areas: 'x x x .' }
+    .areas-1d { grid-template-areas: '. . x x' }
+    .areas-1e { grid-template-areas: '. . x .' }
+
+    .subgrid > .subgrid > :nth-child(2n)   {  background: black; }
+    .subgrid > .subgrid > :nth-child(2n+1) {  background: pink; }
+    .subgrid > .subgrid > * { writing-mode: horizontal-tb; }
+
+    </style>
+  </head>
+  <body>
+
+  <!-- Line names before/after auto repeat -->
+  <div class="grid"><div class="subgrid fill-1a"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1b"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1c"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1d"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1e"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1a"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <!-- Auto repeat line names -->
+  <div class="grid"><div class="subgrid fill-1b"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1c"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1d"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1e"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1a"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:2"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1b"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:3"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1c"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1d"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid fill-1e"><div class="subgrid">
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:4"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+  </div></div></div>
+
+  <!-- Named grid areas -->
+  <div class="grid"><div class="subgrid areas-1a"><div class="subgrid">
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:2"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid areas-1b"><div class="subgrid">
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:2"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid areas-1c"><div class="subgrid">
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:2"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid areas-1d"><div class="subgrid">
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:2"></div>
+  </div></div></div>
+
+  <div class="grid"><div class="subgrid areas-1e"><div class="subgrid">
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:1"></div>
+    <div style="grid-row:2"></div>
+  </div></div></div>
+  </body>
+  </html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005.html b/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005.html
new file mode 100644
index 00000000000..d5bd1781610
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005.html
@@ -0,0 +1,288 @@
+<!DOCTYPE HTML>
+<html><head>
+  <meta charset="utf-8">
+  <title>CSS Grid Test: line names in orthogonal parent subgrid</title>
+  <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-2/#subgrid-listing">
+  <link rel="match" href="orthogonal-writing-mode-005-ref.html">
+  <style>
+body {
+  color:black; background-color:white; font:10px monospace; padding:0; margin:0; line-height:0;
+}
+
+.grid {
+  display: inline-grid;
+  grid-auto-columns: 15px;
+  border: 1px solid;
+  vertical-align: bottom;
+}
+
+.subgrid {
+  display: grid;
+  grid-template-columns: subgrid;
+  grid-column: 3 / span 4;
+  background: grey;
+}
+.grid > .subgrid > .subgrid {
+  writing-mode: vertical-lr;
+  grid-template-rows: subgrid;
+  grid-template-columns: initial;
+  grid-column: 1 / span 4;
+  grid-auto-columns: 8px;
+  grid-auto-flow: column;
+}
+
+.fill-1a  { grid-template-columns: subgrid repeat(auto-fill, [y]) [z] [z] [z] [z] }  /* [y] [z] [z] [z] [z] */
+.fill-1b  { grid-template-columns: subgrid [x] repeat(auto-fill, [y]) [z] [z] [z] }  /* [x] [y] [z] [z] [z] */
+.fill-1c  { grid-template-columns: subgrid [x] [x] repeat(auto-fill, [y]) [z] [z] }  /* [x] [x] [y] [z] [z] */
+.fill-1d  { grid-template-columns: subgrid [x] [x] [x] repeat(auto-fill, [y]) [z] }  /* [x] [x] [x] [y] [z] */
+.fill-1e  { grid-template-columns: subgrid [x] [x] [x] [x] repeat(auto-fill, [y]) }  /* [x] [x] [x] [x] [y] */
+
+.areas-1a { grid-template-areas: 'x x x x' }
+.areas-1b { grid-template-areas: '. x x x' }
+.areas-1c { grid-template-areas: 'x x x .' }
+.areas-1d { grid-template-areas: '. . x x' }
+.areas-1e { grid-template-areas: '. . x .' }
+
+.subgrid > .subgrid > :nth-child(2n)   {  background: black; }
+.subgrid > .subgrid > :nth-child(2n+1) {  background: pink; }
+.subgrid > .subgrid > * { writing-mode: horizontal-tb; }
+
+  </style>
+</head>
+<body>
+
+<!-- Line names before auto repeat -->
+<div class="grid"><div class="subgrid fill-1a"><div class="subgrid">
+  <div style="grid-row:z 5"></div>
+  <div style="grid-row:z 4"></div>
+  <div style="grid-row:z 3"></div>
+  <div style="grid-row:z 2"></div>
+  <div style="grid-row:z 1"></div>
+  <div style="grid-row:z -1"></div>
+  <div style="grid-row:z -2"></div>
+  <div style="grid-row:z -3"></div>
+  <div style="grid-row:z -4"></div>
+  <div style="grid-row:z -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1b"><div class="subgrid">
+  <div style="grid-row:x 5"></div>
+  <div style="grid-row:x 4"></div>
+  <div style="grid-row:x 3"></div>
+  <div style="grid-row:x 2"></div>
+  <div style="grid-row:x 1"></div>
+  <div style="grid-row:x -1"></div>
+  <div style="grid-row:x -2"></div>
+  <div style="grid-row:x -3"></div>
+  <div style="grid-row:x -4"></div>
+  <div style="grid-row:x -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1c"><div class="subgrid">
+  <div style="grid-row:x 5"></div>
+  <div style="grid-row:x 4"></div>
+  <div style="grid-row:x 3"></div>
+  <div style="grid-row:x 2"></div>
+  <div style="grid-row:x 1"></div>
+  <div style="grid-row:x -1"></div>
+  <div style="grid-row:x -2"></div>
+  <div style="grid-row:x -3"></div>
+  <div style="grid-row:x -4"></div>
+  <div style="grid-row:x -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1d"><div class="subgrid">
+  <div style="grid-row:x 5"></div>
+  <div style="grid-row:x 4"></div>
+  <div style="grid-row:x 3"></div>
+  <div style="grid-row:x 2"></div>
+  <div style="grid-row:x 1"></div>
+  <div style="grid-row:x -1"></div>
+  <div style="grid-row:x -2"></div>
+  <div style="grid-row:x -3"></div>
+  <div style="grid-row:x -4"></div>
+  <div style="grid-row:x -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1e"><div class="subgrid">
+  <div style="grid-row:x 5"></div>
+  <div style="grid-row:x 4"></div>
+  <div style="grid-row:x 3"></div>
+  <div style="grid-row:x 2"></div>
+  <div style="grid-row:x 1"></div>
+  <div style="grid-row:x -1"></div>
+  <div style="grid-row:x -2"></div>
+  <div style="grid-row:x -3"></div>
+  <div style="grid-row:x -4"></div>
+  <div style="grid-row:x -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1a"><div class="subgrid">
+  <div style="grid-row:y 5"></div>
+  <div style="grid-row:y 4"></div>
+  <div style="grid-row:y 3"></div>
+  <div style="grid-row:y 2"></div>
+  <div style="grid-row:y 1"></div>
+  <div style="grid-row:y -1"></div>
+  <div style="grid-row:y -2"></div>
+  <div style="grid-row:y -3"></div>
+  <div style="grid-row:y -4"></div>
+  <div style="grid-row:y -5"></div>
+</div></div></div>
+
+<!-- Auto repeat line names -->
+<div class="grid"><div class="subgrid fill-1b"><div class="subgrid">
+  <div style="grid-row:y 5"></div>
+  <div style="grid-row:y 4"></div>
+  <div style="grid-row:y 3"></div>
+  <div style="grid-row:y 2"></div>
+  <div style="grid-row:y 1"></div>
+  <div style="grid-row:y -1"></div>
+  <div style="grid-row:y -2"></div>
+  <div style="grid-row:y -3"></div>
+  <div style="grid-row:y -4"></div>
+  <div style="grid-row:y -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1c"><div class="subgrid">
+  <div style="grid-row:y 5"></div>
+  <div style="grid-row:y 4"></div>
+  <div style="grid-row:y 3"></div>
+  <div style="grid-row:y 2"></div>
+  <div style="grid-row:y 1"></div>
+  <div style="grid-row:y -1"></div>
+  <div style="grid-row:y -2"></div>
+  <div style="grid-row:y -3"></div>
+  <div style="grid-row:y -4"></div>
+  <div style="grid-row:y -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1d"><div class="subgrid">
+  <div style="grid-row:y 5"></div>
+  <div style="grid-row:y 4"></div>
+  <div style="grid-row:y 3"></div>
+  <div style="grid-row:y 2"></div>
+  <div style="grid-row:y 1"></div>
+  <div style="grid-row:y -1"></div>
+  <div style="grid-row:y -2"></div>
+  <div style="grid-row:y -3"></div>
+  <div style="grid-row:y -4"></div>
+  <div style="grid-row:y -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1e"><div class="subgrid">
+  <div style="grid-row:y 5"></div>
+  <div style="grid-row:y 4"></div>
+  <div style="grid-row:y 3"></div>
+  <div style="grid-row:y 2"></div>
+  <div style="grid-row:y 1"></div>
+  <div style="grid-row:y -1"></div>
+  <div style="grid-row:y -2"></div>
+  <div style="grid-row:y -3"></div>
+  <div style="grid-row:y -4"></div>
+  <div style="grid-row:y -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1a"><div class="subgrid">
+  <div style="grid-row:z 5"></div>
+  <div style="grid-row:z 4"></div>
+  <div style="grid-row:z 3"></div>
+  <div style="grid-row:z 2"></div>
+  <div style="grid-row:z 1"></div>
+  <div style="grid-row:z -1"></div>
+  <div style="grid-row:z -2"></div>
+  <div style="grid-row:z -3"></div>
+  <div style="grid-row:z -4"></div>
+  <div style="grid-row:z -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1b"><div class="subgrid">
+  <div style="grid-row:z 5"></div>
+  <div style="grid-row:z 4"></div>
+  <div style="grid-row:z 3"></div>
+  <div style="grid-row:z 2"></div>
+  <div style="grid-row:z 1"></div>
+  <div style="grid-row:z -1"></div>
+  <div style="grid-row:z -2"></div>
+  <div style="grid-row:z -3"></div>
+  <div style="grid-row:z -4"></div>
+  <div style="grid-row:z -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1c"><div class="subgrid">
+  <div style="grid-row:z 5"></div>
+  <div style="grid-row:z 4"></div>
+  <div style="grid-row:z 3"></div>
+  <div style="grid-row:z 2"></div>
+  <div style="grid-row:z 1"></div>
+  <div style="grid-row:z -1"></div>
+  <div style="grid-row:z -2"></div>
+  <div style="grid-row:z -3"></div>
+  <div style="grid-row:z -4"></div>
+  <div style="grid-row:z -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1d"><div class="subgrid">
+  <div style="grid-row:z 5"></div>
+  <div style="grid-row:z 4"></div>
+  <div style="grid-row:z 3"></div>
+  <div style="grid-row:z 2"></div>
+  <div style="grid-row:z 1"></div>
+  <div style="grid-row:z -1"></div>
+  <div style="grid-row:z -2"></div>
+  <div style="grid-row:z -3"></div>
+  <div style="grid-row:z -4"></div>
+  <div style="grid-row:z -5"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid fill-1e"><div class="subgrid">
+  <div style="grid-row:z 5"></div>
+  <div style="grid-row:z 4"></div>
+  <div style="grid-row:z 3"></div>
+  <div style="grid-row:z 2"></div>
+  <div style="grid-row:z 1"></div>
+  <div style="grid-row:z -1"></div>
+  <div style="grid-row:z -2"></div>
+  <div style="grid-row:z -3"></div>
+  <div style="grid-row:z -4"></div>
+  <div style="grid-row:z -5"></div>
+</div></div></div>
+
+<!-- Named grid areas -->
+<div class="grid"><div class="subgrid areas-1a"><div class="subgrid">
+  <div style="grid-row:x-start"></div>
+  <div style="grid-row:x"></div>
+  <div style="grid-row:x-start / x-end"></div>
+  <div style="grid-row:x-end"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid areas-1b"><div class="subgrid">
+  <div style="grid-row:x-start"></div>
+  <div style="grid-row:x"></div>
+  <div style="grid-row:x-start / x-end"></div>
+  <div style="grid-row:x-end"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid areas-1c"><div class="subgrid">
+  <div style="grid-row:x-start"></div>
+  <div style="grid-row:x"></div>
+  <div style="grid-row:x-start / x-end"></div>
+  <div style="grid-row:x-end"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid areas-1d"><div class="subgrid">
+  <div style="grid-row:x-start"></div>
+  <div style="grid-row:x"></div>
+  <div style="grid-row:x-start / x-end"></div>
+  <div style="grid-row:x-end"></div>
+</div></div></div>
+
+<div class="grid"><div class="subgrid areas-1e"><div class="subgrid">
+  <div style="grid-row:x-start"></div>
+  <div style="grid-row:x"></div>
+  <div style="grid-row:x-start / x-end"></div>
+  <div style="grid-row:x-end"></div>
+</div></div></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html b/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html
index 3a1d2707c37..df14ed8350b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html
@@ -11,13 +11,14 @@
   <link rel="match" href="repeat-auto-fill-001-ref.html">
   <style>
 html,body {
-  color:black; background-color:white; font:10px/1 monospace; padding:0; margin:0;
+  color:black; background-color:white; font:10px monospace; padding:0; margin:0; line-height:0;
 }
 
 .grid {
   display: inline-grid;
   grid-auto-columns: 15px;
   border: 1px solid;
+  vertical-align: top;
 }
 
 .subgrid {