From f3e3a0107df12f04f7c181dce87ae246c4cb6803 Mon Sep 17 00:00:00 2001
From: Emily McDonough <emcdonough@mozilla.com>
Date: Fri, 20 Mar 2020 00:27:22 +0000
Subject: [PATCH] Bug 1341507 part 7 - Update mochitests and wpt for supporting
 repeat-auto with multiple values in grid and subgrid. r=mats

Differential Revision: https://phabricator.services.mozilla.com/D60932

--HG--
extra : moz-landing-system : lando
---
 layout/style/test/property_database.js        | 23 +++++++++++++++----
 ...d-auto-repeat-multiple-values-001.html.ini |  2 --
 ...-template-columns-computed-nogrid.html.ini | 19 ---------------
 .../grid-template-columns-computed.html.ini   | 19 ---------------
 ...rid-template-rows-computed-nogrid.html.ini | 19 ---------------
 .../grid-template-rows-computed.html.ini      | 19 ---------------
 ...cement-using-named-grid-lines-003.html.ini |  2 --
 7 files changed, 19 insertions(+), 84 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/parsing/grid-template-columns-computed-nogrid.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/parsing/grid-template-columns-computed.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/parsing/grid-template-rows-computed-nogrid.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/parsing/grid-template-rows-computed.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html.ini

diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index d2e0bfbfc30b..4f1ee59d3aaa 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -11922,6 +11922,8 @@ gCSSProperties["grid-template-columns"] = {
     "[a] repeat( auto-fit,[a b] minmax(0,0) )",
     "[a] 40px repeat(auto-fit,[a b] minmax(1px, 0) [])",
     "[a] calc(1px - 99%) [b] repeat(auto-fit,[a b] minmax(1mm, 1%) [c]) [c]",
+    "repeat(auto-fill, 0 0)",
+    "repeat(auto-fill, 0 [] 0)",
     "repeat(auto-fill,minmax(1%,auto))",
     "repeat(auto-fill,minmax(1em,min-content)) minmax(min-content,0)",
     "repeat(auto-fill,minmax(max-content,1mm))",
@@ -11977,8 +11979,6 @@ gCSSProperties["grid-template-columns"] = {
     "repeat(auto-fit, 0) repeat(auto-fill, 0) ",
     "[a] repeat(auto-fit, 0) repeat(auto-fit, 0) ",
     "[a] repeat(auto-fill, 0) [a] repeat(auto-fill, 0) ",
-    "repeat(auto-fill, 0 0)",
-    "repeat(auto-fill, 0 [] 0)",
     "repeat(auto-fill, min-content)",
     "repeat(auto-fit,max-content)",
     "repeat(auto-fit,1fr)",
@@ -12008,8 +12008,15 @@ if (isGridTemplateSubgridValueEnabled) {
     "subgrid repeat(1, [])",
     "subgrid Repeat(4, [a] [b c] [] [d])",
     "subgrid repeat(auto-fill, [])",
+    "subgrid repeat(Auto-fill, [a b c]) [a] []",
     "subgrid [x] repeat( Auto-fill, [a b c]) []",
-    "subgrid [x] repeat(auto-fill, []) [y z]"
+    "subgrid [x] repeat( auto-fill , [a b] [c]) [y]",
+    "subgrid repeat(auto-fill, [a] [b] [c]) [d]",
+    "subgrid repeat(Auto-fill, [a] [b c] [] [d])",
+    "subgrid [x y] [x] repeat(auto-fill, [a b] [c] [d] [d]) [x] [x]",
+    "subgrid [x] repeat(auto-fill, []) [y z]",
+    "subgrid [x] repeat(auto-fill, [y]) [z] [] repeat(2, [a] [b]) [y] []",
+    "subgrid [x] repeat(auto-fill, []) [x y] [z] [] []"
   );
   gCSSProperties["grid-template-columns"].invalid_values.push(
     "subgrid [inherit]",
@@ -12031,12 +12038,20 @@ if (isGridTemplateSubgridValueEnabled) {
     "subgrid repeat(2, [40px])",
     "subgrid repeat(2, foo)",
     "subgrid repeat(1, repeat(1, []))",
+    "subgrid repeat(auto-fill)",
+    "subgrid repeat(auto-fill) [a]",
+    "subgrid repeat(auto-fill) []",
+    "subgrid [a] repeat(auto-fill)",
+    "subgrid repeat(auto-fill,)",
+    "subgrid repeat(auto-fill,)",
+    "subgrid repeat(auto-fill,) [a]",
+    "subgrid repeat(auto-fill,) []",
+    "subgrid [a] repeat(auto-fill,)",
     "subgrid repeat(auto-fit,[])",
     "subgrid [] repeat(auto-fit,[])",
     "subgrid [a] repeat(auto-fit,[])",
     "subgrid repeat(auto-fill, 1px)",
     "subgrid repeat(auto-fill, 1px [])",
-    "subgrid repeat(Auto-fill, [a] [b c] [] [d])",
     "subgrid repeat(auto-fill, []) repeat(auto-fill, [])"
   );
 }
diff --git a/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html.ini
deleted file mode 100644
index 07fdcfd2d89a..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-auto-repeat-multiple-values-001.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/parsing/grid-template-columns-computed-nogrid.html.ini b/testing/web-platform/meta/css/css-grid/parsing/grid-template-columns-computed-nogrid.html.ini
deleted file mode 100644
index 454d0b32b3b5..000000000000
--- a/testing/web-platform/meta/css/css-grid/parsing/grid-template-columns-computed-nogrid.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[grid-template-columns-computed-nogrid.html]
-  [Property grid-template-columns value '[a\] 1px repeat(auto-fit, 2px [b\] 3px) 4px [d\]']
-    expected: FAIL
-
-  [Property grid-template-columns value '[a\] 1em repeat(auto-fit, 2em [b\] 3em) 4em [d\]']
-    expected: FAIL
-
-  [Property grid-template-columns value '[a\] 1px repeat(auto-fill, 2px [b\] 3px) 4px [d\]']
-    expected: FAIL
-
-  [Property grid-template-columns value '[a\] 1em repeat(auto-fill, 2em [b\] 3em) 4em [d\]']
-    expected: FAIL
-
-  [Property grid-template-columns value '1px [a\] repeat(auto-fit, 2px 3px) [b\] 4px']
-    expected: FAIL
-
-  [Property grid-template-columns value '1px [a\] repeat(auto-fill, 2px 3px) [b\] 4px']
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-grid/parsing/grid-template-columns-computed.html.ini b/testing/web-platform/meta/css/css-grid/parsing/grid-template-columns-computed.html.ini
deleted file mode 100644
index ec5203174f1c..000000000000
--- a/testing/web-platform/meta/css/css-grid/parsing/grid-template-columns-computed.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[grid-template-columns-computed.html]
-  [Property grid-template-columns value '[a\] 1px repeat(auto-fit, 2px [b\] 3px) 4px [d\]']
-    expected: FAIL
-
-  [Property grid-template-columns value '[a\] 1em repeat(auto-fit, 2em [b\] 3em) 4em [d\]']
-    expected: FAIL
-
-  [Property grid-template-columns value '[a\] 1px repeat(auto-fill, 2px [b\] 3px) 4px [d\]']
-    expected: FAIL
-
-  [Property grid-template-columns value '[a\] 1em repeat(auto-fill, 2em [b\] 3em) 4em [d\]']
-    expected: FAIL
-
-  [Property grid-template-columns value '1px [a\] repeat(auto-fit, 2px 3px) [b\] 4px']
-    expected: FAIL
-
-  [Property grid-template-columns value '1px [a\] repeat(auto-fill, 2px 3px) [b\] 4px']
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-grid/parsing/grid-template-rows-computed-nogrid.html.ini b/testing/web-platform/meta/css/css-grid/parsing/grid-template-rows-computed-nogrid.html.ini
deleted file mode 100644
index c801f56dbbb9..000000000000
--- a/testing/web-platform/meta/css/css-grid/parsing/grid-template-rows-computed-nogrid.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[grid-template-rows-computed-nogrid.html]
-  [Property grid-template-rows value '1px [a\] repeat(auto-fill, 2px 3px) [b\] 4px']
-    expected: FAIL
-
-  [Property grid-template-rows value '[a\] 1px repeat(auto-fit, 2px [b\] 3px) 4px [d\]']
-    expected: FAIL
-
-  [Property grid-template-rows value '[a\] 1px repeat(auto-fill, 2px [b\] 3px) 4px [d\]']
-    expected: FAIL
-
-  [Property grid-template-rows value '1px [a\] repeat(auto-fit, 2px 3px) [b\] 4px']
-    expected: FAIL
-
-  [Property grid-template-rows value '[a\] 1em repeat(auto-fit, 2em [b\] 3em) 4em [d\]']
-    expected: FAIL
-
-  [Property grid-template-rows value '[a\] 1em repeat(auto-fill, 2em [b\] 3em) 4em [d\]']
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-grid/parsing/grid-template-rows-computed.html.ini b/testing/web-platform/meta/css/css-grid/parsing/grid-template-rows-computed.html.ini
deleted file mode 100644
index 46eb6566752f..000000000000
--- a/testing/web-platform/meta/css/css-grid/parsing/grid-template-rows-computed.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[grid-template-rows-computed.html]
-  [Property grid-template-rows value '1px [a\] repeat(auto-fill, 2px 3px) [b\] 4px']
-    expected: FAIL
-
-  [Property grid-template-rows value '[a\] 1px repeat(auto-fit, 2px [b\] 3px) 4px [d\]']
-    expected: FAIL
-
-  [Property grid-template-rows value '[a\] 1px repeat(auto-fill, 2px [b\] 3px) 4px [d\]']
-    expected: FAIL
-
-  [Property grid-template-rows value '1px [a\] repeat(auto-fit, 2px 3px) [b\] 4px']
-    expected: FAIL
-
-  [Property grid-template-rows value '[a\] 1em repeat(auto-fit, 2em [b\] 3em) 4em [d\]']
-    expected: FAIL
-
-  [Property grid-template-rows value '[a\] 1em repeat(auto-fill, 2em [b\] 3em) 4em [d\]']
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html.ini b/testing/web-platform/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html.ini
deleted file mode 100644
index ed32e5e31dd5..000000000000
--- a/testing/web-platform/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-placement-using-named-grid-lines-003.html]
-  expected: FAIL