diff --git a/Cargo.lock b/Cargo.lock index 2b4543dddfc..63206cafbb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7217,9 +7217,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348c37cb6f9d9f757152332fa9a6c024bcf3c1346925a033246ac47c6ca2e238" +checksum = "944a2a0b6070d217b69afb819f65f84ba093c43d627571fdac1c46f03a14d326" dependencies = [ "arrayvec", "grid", diff --git a/Cargo.toml b/Cargo.toml index e72c1484cd6..74c37705f04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -132,7 +132,7 @@ style_malloc_size_of = { package = "malloc_size_of", git = "https://github.com/s surfman = { git = "https://github.com/servo/surfman", rev = "300789ddbda45c89e9165c31118bf1c4c07f89f6", features = ["chains"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } synstructure = "0.13" -taffy = { version = "0.7.4", default-features = false, features = ["std", "serde", "grid", "detailed_layout_info"] } +taffy = { version = "0.7.5", default-features = false, features = ["std", "serde", "grid", "detailed_layout_info"] } thin-vec = "0.2.13" tikv-jemalloc-sys = "0.6.0" tikv-jemallocator = "0.6.0" diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-fit-content-tracks-dont-stretch-001.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-fit-content-tracks-dont-stretch-001.html.ini deleted file mode 100644 index 9a7d06c5be0..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-fit-content-tracks-dont-stretch-001.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[grid-fit-content-tracks-dont-stretch-001.html] - [.grid 25] - expected: FAIL - - [.grid 26] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-place-content-001.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-place-content-001.html.ini deleted file mode 100644 index e672385c862..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-place-content-001.html.ini +++ /dev/null @@ -1,18 +0,0 @@ -[grid-place-content-001.html] - [.grid 12] - expected: FAIL - - [.grid 13] - expected: FAIL - - [.grid 15] - expected: FAIL - - [.grid 17] - expected: FAIL - - [.grid 18] - expected: FAIL - - [.grid 20] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini b/tests/wpt/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini deleted file mode 100644 index c9d77650e8a..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-self-baseline-changes-grid-area-size-001.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.tentative.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.tentative.html.ini index 10cfd8d9642..c51cb6f3e19 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.tentative.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.tentative.html.ini @@ -1,114 +1,6 @@ [grid-inline-template-columns-rows-resolved-values-001.tentative.html] - [Children of 'grid' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - ['grid' with: grid-template-columns: auto auto; and grid-template-rows: ;] expected: FAIL - [Children of 'grid' with: grid-template-columns: auto auto; and grid-template-rows: ;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 100px 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: ; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: ; and grid-template-rows: 50px 30px;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 60px; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 60px; and grid-template-rows: 50px 30px;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 100px 60px; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px 50px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px 50px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px 50px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px 50px; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px 50px; and grid-template-rows: 60px 50px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - ['gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: auto auto;] expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: auto auto;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 100px 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: 50px 30px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 60px; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 60px; and grid-template-rows: 50px 30px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 100px 60px; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px 70px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px 70px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px 70px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px 70px; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px 70px; and grid-template-rows: 60px 70px;] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-repeat-max-width-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-repeat-max-width-001.html.ini deleted file mode 100644 index 9fdc3e2c723..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-repeat-max-width-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-repeat-max-width-001.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-flexible-lengths-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-flexible-lengths-001.html.ini index 89b6243a51d..8566b41781b 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-flexible-lengths-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-flexible-lengths-001.html.ini @@ -10,27 +10,3 @@ ['grid' with: grid-template-columns: [a\] repeat(4, [b\] 1fr [c\]) [d\]; and grid-template-rows: [z\] repeat(4, [y\] 1fr) [x\];] expected: FAIL - - ['grid' with: grid-template-columns: fr; and grid-template-rows: fr;] - expected: FAIL - - ['grid' with: grid-template-columns: 1 fr; and grid-template-rows: 1 fr;] - expected: FAIL - - ['grid' with: grid-template-columns: 1free-space; and grid-template-rows: 1free-space;] - expected: FAIL - - ['grid' with: grid-template-columns: -2fr; and grid-template-rows: -2fr;] - expected: FAIL - - ['grid' with: grid-template-columns: 0,5fr; and grid-template-rows: 0,5fr;] - expected: FAIL - - ['grid' with: grid-template-columns: calc(1fr + 100px); and grid-template-rows: calc(1fr + 100px);] - expected: FAIL - - ['grid' with: grid-template-columns: (1fr) auto; and grid-template-rows: (1fr) auto;] - expected: FAIL - - ['grid' with: grid-template-columns: minmax(1fr, 1000px); and grid-template-rows: minmax(1fr, 700px);] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-grid-template-columns-rows-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-grid-template-columns-rows-001.html.ini index 152f0db98f7..fe704f0486e 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-grid-template-columns-rows-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-grid-template-columns-rows-001.html.ini @@ -1,13 +1,4 @@ [grid-support-grid-template-columns-rows-001.html] - ['grid' with: grid-template-columns: none; and grid-template-rows: none;] - expected: FAIL - - ['emptyGrid' with: grid-template-columns: auto; and grid-template-rows: auto;] - expected: FAIL - - ['grid' with: grid-template-columns: auto; and grid-template-rows: auto;] - expected: FAIL - ['emptyGrid' with: grid-template-columns: calc(200px + 10%); and grid-template-rows: calc(25% + 50px);] expected: FAIL @@ -25,15 +16,3 @@ ['grid' with: grid-template-columns: min-content 1fr calc(20px + 10%) minmax(30em, 50em); and grid-template-rows: min-content 1fr calc(10% + 40px) minmax(3em, 5em);] expected: FAIL - - ['grid' with: grid-template-columns: foo; and grid-template-rows: bar;] - expected: FAIL - - ['grid' with: grid-template-columns: auto none; and grid-template-rows: none auto;] - expected: FAIL - - ['grid' with: grid-template-columns: 100px, 200px; and grid-template-rows: 300px, 400px;] - expected: FAIL - - ['grid' with: grid-template-columns: minmax(100px, 200px, 300px); and grid-template-rows: minmax(100px, 200px, 300px);] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-001.html.ini index c1ad62c7934..f6a95fadbe9 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-001.html.ini @@ -11,12 +11,6 @@ ['grid' with: grid-template-columns: [F1rst-L1_n3\] auto [L4st-L1_n3\]; and grid-template-rows: [F1rst-L1_n3\] auto [L4st-L1_n3\];] expected: FAIL - ['emptyGrid' with: grid-template-columns: [\] auto [ \]; and grid-template-rows: [ \] auto [\];] - expected: FAIL - - ['grid' with: grid-template-columns: [\] auto [ \]; and grid-template-rows: [ \] auto [\];] - expected: FAIL - ['emptyGrid' with: grid-template-columns: [first\] auto; and grid-template-rows: [first\] auto;] expected: FAIL @@ -112,66 +106,3 @@ ['grid' with: grid-template-columns: [a\] min-content [b\] 1fr [c\] calc(20px + 10%) [d\] minmax(30em, 50em) [e\]; and grid-template-rows: [z\] min-content [y\] 1fr [x\] calc(10% + 40px) [w\] minmax(3em, 5em) [v\];] expected: FAIL - - ['grid' with: grid-template-columns: [a\]; and grid-template-rows: [a\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a b\]; and grid-template-rows: [a b\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a\] none [b\]; and grid-template-rows: [a\] none [b\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a\] [b\]; and grid-template-rows: [a\] [b\];] - expected: FAIL - - ['grid' with: grid-template-columns: a auto b; and grid-template-rows: a auto b;] - expected: FAIL - - ['grid' with: grid-template-columns: (a) auto (b); and grid-template-rows: (a) auto (b);] - expected: FAIL - - ['grid' with: grid-template-columns: 'a' auto 'b'; and grid-template-rows: 'a' auto 'b';] - expected: FAIL - - ['grid' with: grid-template-columns: "a" auto "b"; and grid-template-rows: "a" auto "b";] - expected: FAIL - - ['grid' with: grid-template-columns: [a, b\] auto [a, b\]; and grid-template-rows: [a, b\] auto [a, b\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a\] [b\] auto [c d\] [e\]; and grid-template-rows: [a\] [b\] auto [c d\] [e\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a [b\]\] auto [c\]; and grid-template-rows: [a [b\]\] auto [c\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a\] auto [[b\]\]; and grid-template-rows: [a\] auto [[b\]\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a auto [b\]; and grid-template-rows: [a auto [b\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a 100px\] auto [b\]; and grid-template-rows: [a 100px\] auto [b\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a 50%\] auto [b\]; and grid-template-rows: [a 50%\] auto [b\];] - expected: FAIL - - ['grid' with: grid-template-columns: [5\] auto [10\]; and grid-template-rows: [5\] auto [10\];] - expected: FAIL - - ['grid' with: grid-template-columns: [a.\] auto [b*\]; and grid-template-rows: [a.\] auto [b*\];] - expected: FAIL - - ['grid' with: grid-template-columns: [#a\] auto [$b\]; and grid-template-rows: [#a\] auto [$b\];] - expected: FAIL - - ['grid' with: grid-template-columns: [initial\] auto; and grid-template-rows: [initial\] auto;] - expected: FAIL - - ['grid' with: grid-template-columns: [inherit\] auto; and grid-template-rows: [inherit\] auto;] - expected: FAIL - - ['grid' with: grid-template-columns: [default\] auto; and grid-template-rows: [default\] auto;] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-repeat-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-repeat-001.html.ini index 41598d30b2f..cbada74fad8 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-repeat-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-repeat-001.html.ini @@ -1,16 +1,4 @@ [grid-support-repeat-001.html] - ['emptyGrid' with: grid-template-columns: repeat(1, auto); and grid-template-rows: repeat(1, auto);] - expected: FAIL - - ['grid' with: grid-template-columns: repeat(1, auto); and grid-template-rows: repeat(1, auto);] - expected: FAIL - - ['emptyGrid' with: grid-template-columns: repeat(2, auto); and grid-template-rows: repeat(2, auto);] - expected: FAIL - - ['grid' with: grid-template-columns: repeat(2, auto); and grid-template-rows: repeat(2, auto);] - expected: FAIL - ['emptyGrid' with: grid-template-columns: repeat(2, minmax(50px, calc(50px + 50%))); and grid-template-rows: repeat(2, minmax(50px, calc(50px + 50%)));] expected: FAIL @@ -53,27 +41,6 @@ ['grid' with: grid-template-columns: [a\] min-content repeat(2, [b\] 1fr [c\] calc(20px + 10%)) [d\] minmax(30em, 50em) [e\]; and grid-template-rows: [z\] min-content repeat(2, [y\] 1fr [x\] calc(10% + 40px)) [w\] minmax(3em, 5em) [v\];] expected: FAIL - ['grid' with: grid-template-columns: repeat(-1, auto); and grid-template-rows: repeat(-1, auto);] - expected: FAIL - - ['grid' with: grid-template-columns: repeat(auto, 2); and grid-template-rows: repeat(auto, 2);] - expected: FAIL - - ['grid' with: grid-template-columns: repeat 2, auto; and grid-template-rows: repeat 2, auto;] - expected: FAIL - - ['grid' with: grid-template-columns: repeat(2 auto); and grid-template-rows: repeat(2 auto);] - expected: FAIL - - ['grid' with: grid-template-columns: 100px (repeat 2, auto); and grid-template-rows: (repeat 2, auto);] - expected: FAIL - - ['grid' with: grid-template-columns: repeat(2, 50px repeat(2, 100px)); and grid-template-rows: repeat(2, 50px repeat(2, 100px));] - expected: FAIL - - ['grid' with: grid-template-columns: 100px repeat(2, [a\]); and grid-template-rows: 100px repeat(2, [a\]);] - expected: FAIL - ['grid' with: grid-template-columns: [a\] repeat(2, [b\] 100px); and grid-template-rows: [a\] repeat(2, [b\] 100px);] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html.ini deleted file mode 100644 index 6bcda0f3b48..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html.ini +++ /dev/null @@ -1,108 +0,0 @@ -[grid-template-columns-rows-resolved-values-001.html] - ['grid' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - - ['grid' with: grid-template-columns: auto auto; and grid-template-rows: ;] - expected: FAIL - - ['grid' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - ['grid' with: grid-template-columns: 100px 60px; and grid-template-rows: ;] - expected: FAIL - - ['grid' with: grid-template-columns: ; and grid-template-rows: 50px;] - expected: FAIL - - ['grid' with: grid-template-columns: ; and grid-template-rows: 50px 30px;] - expected: FAIL - - ['grid' with: grid-template-columns: 60px; and grid-template-rows: 50px;] - expected: FAIL - - ['grid' with: grid-template-columns: 60px; and grid-template-rows: 50px 30px;] - expected: FAIL - - ['grid' with: grid-template-columns: 100px 60px; and grid-template-rows: 50px;] - expected: FAIL - - ['gridItemsPositions' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - - ['gridItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - ['gridItemsPositions' with: grid-template-columns: 60px 50px; and grid-template-rows: ;] - expected: FAIL - - ['gridItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px;] - expected: FAIL - - ['gridItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px 50px;] - expected: FAIL - - ['gridItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px;] - expected: FAIL - - ['gridItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px 50px;] - expected: FAIL - - ['gridItemsPositions' with: grid-template-columns: 60px 50px; and grid-template-rows: 60px;] - expected: FAIL - - ['gridItemsPositions' with: grid-template-columns: 60px 50px; and grid-template-rows: 60px 50px;] - expected: FAIL - - ['gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - - ['gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: auto auto;] - expected: FAIL - - ['gridAutoFlowColumn' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - ['gridAutoFlowColumn' with: grid-template-columns: 100px 60px; and grid-template-rows: ;] - expected: FAIL - - ['gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: 50px;] - expected: FAIL - - ['gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: 50px 30px;] - expected: FAIL - - ['gridAutoFlowColumn' with: grid-template-columns: 60px; and grid-template-rows: 50px;] - expected: FAIL - - ['gridAutoFlowColumn' with: grid-template-columns: 60px; and grid-template-rows: 50px 30px;] - expected: FAIL - - ['gridAutoFlowColumn' with: grid-template-columns: 100px 60px; and grid-template-rows: 50px;] - expected: FAIL - - ['gridAutoFlowColumnItemsPositions' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - - ['gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - ['gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px 70px; and grid-template-rows: ;] - expected: FAIL - - ['gridAutoFlowColumnItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px;] - expected: FAIL - - ['gridAutoFlowColumnItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px 70px;] - expected: FAIL - - ['gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px;] - expected: FAIL - - ['gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px 70px;] - expected: FAIL - - ['gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px 70px; and grid-template-rows: 60px;] - expected: FAIL - - ['gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px 70px; and grid-template-rows: 60px 70px;] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.tentative.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.tentative.html.ini index df087ba7c45..135bbae204f 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.tentative.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.tentative.html.ini @@ -1,118 +1,10 @@ [grid-template-columns-rows-resolved-values-001.tentative.html] - [Children of 'grid' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - ['grid' with: grid-template-columns: auto auto; and grid-template-rows: ;] expected: FAIL - [Children of 'grid' with: grid-template-columns: auto auto; and grid-template-rows: ;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 100px 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: ; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: ; and grid-template-rows: 50px 30px;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 60px; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 60px; and grid-template-rows: 50px 30px;] - expected: FAIL - - [Children of 'grid' with: grid-template-columns: 100px 60px; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px 50px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px 50px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px 50px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px 50px; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridItemsPositions' with: grid-template-columns: 60px 50px; and grid-template-rows: 60px 50px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - ['gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: auto auto;] expected: FAIL - [Children of 'gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: auto auto;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 100px 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: ; and grid-template-rows: 50px 30px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 60px; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 60px; and grid-template-rows: 50px 30px;] - expected: FAIL - - [Children of 'gridAutoFlowColumn' with: grid-template-columns: 100px 60px; and grid-template-rows: 50px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: ; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px 70px; and grid-template-rows: ;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: ; and grid-template-rows: 60px 70px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px; and grid-template-rows: 60px 70px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px 70px; and grid-template-rows: 60px;] - expected: FAIL - - [Children of 'gridAutoFlowColumnItemsPositions' with: grid-template-columns: 60px 70px; and grid-template-rows: 60px 70px;] - expected: FAIL - ['grid' with: grid-template-columns: ; and grid-template-rows: ;] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-items-001.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-items-001.html.ini deleted file mode 100644 index e51c666f6fd..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-items/grid-items-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-items-001.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-items-002.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-items-002.html.ini deleted file mode 100644 index b21bb7ba631..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-items/grid-items-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-items-002.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-015.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-015.html.ini deleted file mode 100644 index 24857c2ef55..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-015.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-minimum-size-grid-items-015.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini deleted file mode 100644 index b4bc0de7bd2..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-order-property-auto-placement-001.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini deleted file mode 100644 index e47c1506823..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-order-property-auto-placement-002.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini deleted file mode 100644 index eae19094d7d..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-order-property-auto-placement-003.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini deleted file mode 100644 index 8f4c8601f0e..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-order-property-auto-placement-004.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini deleted file mode 100644 index 5c52edde673..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-order-property-auto-placement-005.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-layout-properties.html.ini b/tests/wpt/meta/css/css-grid/grid-layout-properties.html.ini index 94bf766ccf6..80b18686f8c 100644 --- a/tests/wpt/meta/css/css-grid/grid-layout-properties.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-layout-properties.html.ini @@ -1,19 +1,7 @@ [grid-layout-properties.html] - [grid-template-columns.initial] - expected: FAIL - - [grid-template-columns.none] - expected: FAIL - [grid-template-columns.] expected: FAIL - [grid-template-columns..auto] - expected: FAIL - - [grid-template-columns.reset] - expected: FAIL - [grid-template-rows.] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-float-002.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-float-002.html.ini deleted file mode 100644 index 665d2d54938..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-model/grid-float-002.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[grid-float-002.html] - [.container 1] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-004.html.ini b/tests/wpt/meta/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-004.html.ini deleted file mode 100644 index 2f618c421db..00000000000 --- a/tests/wpt/meta/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-004.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[grid-content-distribution-must-account-for-track-sizing-004.html] - [.grid 1] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html.ini b/tests/wpt/meta/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html.ini index 94ea937e3a2..ba65750e4da 100644 --- a/tests/wpt/meta/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html.ini +++ b/tests/wpt/meta/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html.ini @@ -1,31 +1,10 @@ [grid-columns-rows-get-set-multiple.html] - [Test getting grid-template-columns and grid-template-rows set through CSS for element 'gridWithAutoElement' : grid-template-columns = '0px 17px', grid-template-rows = '0px 3px'] - expected: FAIL - - [Test getting grid-template-columns and grid-template-rows set through CSS for element 'gridWithThreeItems' : grid-template-columns = '15px 0px 100px', grid-template-rows = '120px 18px 0px'] - expected: FAIL - [Test getting grid-template-columns and grid-template-rows set through CSS for element 'gridWithCalcAndMinMax' : grid-template-columns = '190px 80px', grid-template-rows = '150px 53px'] expected: FAIL [Test getting grid-template-columns and grid-template-rows set through CSS for element 'gridWithCalcInsideMinMax' : grid-template-columns = '400px 120px', grid-template-rows = '150px 175px'] expected: FAIL - [Test getting grid-template-columns and grid-template-rows set through CSS for element 'gridWithAutoInsideMinMax' : grid-template-columns = '0px 30px', grid-template-rows = '132px 60px'] - expected: FAIL - - [Test getting and setting grid-template-rows and grid-template-columns through JS: grid-template-columns = '0px 0px', element.style.gridTemplateColumns = 'auto auto', grid-template-rows = '0px 0px', element.style.gridTemplateRows = 'auto auto'] - expected: FAIL - - [Test getting and setting grid-template-rows and grid-template-columns through JS: grid-template-columns = '0px 160px 22px', element.style.gridTemplateColumns = 'auto 16em 22px', grid-template-rows = '336px 100px 0px', element.style.gridTemplateRows = '56% 10em auto'] - expected: FAIL - - [Test getting and setting grid-template-rows and grid-template-columns through JS: grid-template-columns = '160px 20px', element.style.gridTemplateColumns = '16em minmax(16px, 20px)', grid-template-rows = '90px 0px', element.style.gridTemplateRows = 'minmax(10%, 15%) auto'] - expected: FAIL - - [Test getting and setting grid-template-rows and grid-template-columns through JS: grid-template-columns = '25px 20px', element.style.gridTemplateColumns = 'calc(25px) calc(2em)', grid-template-rows = '0px 60px', element.style.gridTemplateRows = 'auto calc(10%)'] - expected: FAIL - [Test getting and setting grid-template-rows and grid-template-columns through JS: grid-template-columns = '345px 92px', element.style.gridTemplateColumns = 'calc(25px + 40%) minmax(min-content, calc(10% + 12px))', grid-template-rows = '100px 0px', element.style.gridTemplateRows = 'minmax(calc(75% - 350px), max-content) auto'] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/parsing/grid-content-sized-columns-resolution.html.ini b/tests/wpt/meta/css/css-grid/parsing/grid-content-sized-columns-resolution.html.ini index 19611208ebe..83702d22a76 100644 --- a/tests/wpt/meta/css/css-grid/parsing/grid-content-sized-columns-resolution.html.ini +++ b/tests/wpt/meta/css/css-grid/parsing/grid-content-sized-columns-resolution.html.ini @@ -2,21 +2,12 @@ [Element 'gridMinContentFixedAndAuto' grid-template-columns value computes to '15px 75px'] expected: FAIL - [Element 'gridAutoAndAuto' grid-template-columns value computes to '45px 45px'] - expected: FAIL - [Element 'gridMinContentAndMaxContentFixed' grid-template-columns value computes to '20px 70px'] expected: FAIL [Element 'gridMaxContentFixedAndAuto' grid-template-columns value computes to '65px 25px'] expected: FAIL - [Element 'gridAutoMinContent' grid-template-columns value computes to '70px 20px'] - expected: FAIL - - [Element 'gridAutoMaxContent' grid-template-columns value computes to '20px 70px'] - expected: FAIL - [Element 'gridFixedMinContentAndMaxContentUnsortedConstrained' grid-template-columns value computes to '10px 70px'] expected: FAIL @@ -26,15 +17,9 @@ [Element 'gridMinContentFixedAndAutoUnsorted' grid-template-columns value computes to '15px 90px'] expected: FAIL - [Element 'gridAutoAndAutoUnsorted' grid-template-columns value computes to '60px 30px'] - expected: FAIL - [Element 'gridMaxContentFixedAndAutoUnsorted' grid-template-columns value computes to '15px 70px'] expected: FAIL - [Element 'gridAutoMinContentUnsorted' grid-template-columns value computes to '50px 60px'] - expected: FAIL - [Element 'gridAutoMaxContentUnsorted' grid-template-columns value computes to '0px 90px'] expected: FAIL @@ -43,6 +28,3 @@ [Element 'gridMaxContentFixedAndAutoAboveLimits' grid-template-columns value computes to '15px 135px'] expected: FAIL - - [Element 'gridAutoAndMinContentFixedAndMinContent' grid-template-columns value computes to '55px 30px 65px'] - expected: FAIL