aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <infra@servo.org>2023-06-14 11:00:45 +0200
committerGitHub <noreply@github.com>2023-06-14 11:00:45 +0200
commitf8235ab3fb29695cd3803532657f34f4323b9572 (patch)
treecc2d404abf6d72f1fe75f5b6cb4dd6243518df98
parent9260683b5fbc7fa9fe2cc75bbfccbcd9d0e245fd (diff)
parentae819d690ef3cb07b816bc49f95da301ce16d347 (diff)
downloadservo-f8235ab3fb29695cd3803532657f34f4323b9572.tar.gz
servo-f8235ab3fb29695cd3803532657f34f4323b9572.zip
Auto merge of #29845 - mrobinson:floats-always-on, r=Loirooriol
Layout 2020: Remove the floats preference Enable floats always. It doesn't make sense to have this preference as it's a basic feature of an experimental layout engine. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] There are tests for these changes <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
-rw-r--r--components/config/prefs.rs3
-rw-r--r--components/style/properties/longhands/box.mako.rs2
-rw-r--r--resources/prefs.json1
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/__dir__.ini1
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-001.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-006.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-shorthand-001.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-007.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-008.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-013.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-018.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-023.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-024.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-031.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-036.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-041.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-046.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-175.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-001.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-002.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-003.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-004.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/css1/c5512-brdr-rw-001.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/css1/c5514-brdr-lw-001.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats/float-root.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-in-table-caption-001.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-placement-005.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-placement-vertical-001a.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule3-outside-right-002.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule7-outside-left-001.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule7-outside-right-001.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-004.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-005.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-006.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-009.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-012.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-013.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-014.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-015.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-007.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-009.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-012.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-013.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-014.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-015.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-margins-004.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/width-non-replaced-inline-001.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-009.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/text/white-space-processing-048.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-backgrounds/background-gradient-subpixel-fills-area.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-space.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-overlapping-002.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-color/inline-opacity-float-child.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-006.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-007.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-009.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-intrinsics-001.html.ini3
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-001.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-004.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-001.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-vertical-align-effect.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-iframe-intrinsic-size-001.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-001.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-007.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-016.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-formatting-interop.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-variable-auto-basis.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-variable-zero-basis.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-float.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexible-order.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/order/order-with-row-reverse.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-float-paint.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-logical/animations/float-interpolation.html.ini54
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-1.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-2.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-reftest.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-position/position-absolute-chrome-bug-002.html.ini3
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-transforms/transform-origin-013.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-ui/outline-003.html.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryListEvent.html.ini3
-rw-r--r--tests/wpt/metadata-layout-2020/css/cssom/serialize-media-rule.html.ini6
-rw-r--r--tests/wpt/metadata-layout-2020/css/cssom/serialize-values.html.ini27
-rw-r--r--tests/wpt/metadata-layout-2020/css/filter-effects/filtered-inline-applies-to-float.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/__dir__.ini1
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/absolute_block_format_ctx.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/absolute_hypothetical_float.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/background_position_shorthand.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/background_repeat_both_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_cleared_float_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_complex_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_float_inorder_interaction_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_relative_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_translation_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/box_sizing_sanity_check_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/content_color.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/first_child_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/first_of_type_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/fixed_width_overrides_child_intrinsic_width_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/flex_nochild.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/float_intrinsic_width_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/float_right_intrinsic_width_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/float_under_top_margin_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/floated_list_item_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/floated_negative_margins_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/img_width_style_intrinsic_width_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/incremental_float_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/inline_block_parent_padding_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/inline_element_border_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/intrinsic_border_box.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/last_child_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/last_of_type_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/negative_margin_uncle_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/nth_child_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/nth_last_child_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/nth_last_of_type_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/nth_of_type_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/only_child_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/only_of_type_pseudo_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/percentage_height_float_a.html.ini2
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/table_float_translation_a.html.ini2
135 files changed, 37 insertions, 315 deletions
diff --git a/components/config/prefs.rs b/components/config/prefs.rs
index fd213766ebe..d72e64ad7c8 100644
--- a/components/config/prefs.rs
+++ b/components/config/prefs.rs
@@ -445,9 +445,6 @@ mod gen {
flexbox: {
enabled: bool,
},
- floats: {
- enabled: bool,
- },
#[serde(default = "default_layout_threads")]
threads: i64,
viewport: {
diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index 33b28375847..9c2028eb915 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -67,7 +67,6 @@ ${helpers.predefined_type(
"computed::Float::None",
engines="gecko servo-2013 servo-2020",
initial_specified_value="specified::Float::None",
- servo_2020_pref="layout.floats.enabled",
spec="https://drafts.csswg.org/css-box/#propdef-float",
animation_value_type="discrete",
servo_restyle_damage="rebuild_and_reflow",
@@ -79,7 +78,6 @@ ${helpers.predefined_type(
"Clear",
"computed::Clear::None",
engines="gecko servo-2013 servo-2020",
- servo_2020_pref="layout.floats.enabled",
animation_value_type="discrete",
gecko_ffi_name="mBreakType",
spec="https://drafts.csswg.org/css-box/#propdef-clear",
diff --git a/resources/prefs.json b/resources/prefs.json
index 1ffe6001776..f093171c6ee 100644
--- a/resources/prefs.json
+++ b/resources/prefs.json
@@ -100,7 +100,6 @@
"layout.animations.test.enabled": false,
"layout.columns.enabled": false,
"layout.flexbox.enabled": false,
- "layout.floats.enabled": false,
"layout.threads": 3,
"layout.viewport.enabled": false,
"layout.writing-mode.enabled": false,
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/__dir__.ini b/tests/wpt/metadata-layout-2020/css/CSS2/__dir__.ini
deleted file mode 100644
index 43a774a6216..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: ["layout.floats.enabled:true"]
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-001.xht.ini
deleted file mode 100644
index 8b8db1cd47e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-color-001.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-006.xht.ini
deleted file mode 100644
index c7f866ec9e9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-006.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-color-006.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-shorthand-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-shorthand-001.xht.ini
deleted file mode 100644
index 1e284555faf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-color-shorthand-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-color-shorthand-001.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-007.xht.ini
deleted file mode 100644
index 4b494b46741..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-007.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-007.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-008.xht.ini
deleted file mode 100644
index d28d74901da..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-008.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-008.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-013.xht.ini
deleted file mode 100644
index 0c844231910..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-013.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-013.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-018.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-018.xht.ini
deleted file mode 100644
index f3be54b4520..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-018.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-018.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-023.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-023.xht.ini
deleted file mode 100644
index b6b1fb20235..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-023.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-023.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-024.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-024.xht.ini
deleted file mode 100644
index accb7d2f8dd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-024.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-024.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-031.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-031.xht.ini
deleted file mode 100644
index 3aae9447b52..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-031.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-031.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-036.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-036.xht.ini
deleted file mode 100644
index bddeb613728..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-036.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-036.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-041.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-041.xht.ini
deleted file mode 100644
index 4d4d8e48365..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-041.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-041.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-046.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-046.xht.ini
deleted file mode 100644
index 4159b8c80a4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-046.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-046.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-175.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-175.xht.ini
deleted file mode 100644
index 594ad21de75..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-right-color-175.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-right-color-175.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-001.xht.ini
deleted file mode 100644
index 4f7c1691402..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-width-shorthand-001.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-002.xht.ini
deleted file mode 100644
index 012990ea0a1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-width-shorthand-002.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-003.xht.ini
deleted file mode 100644
index 6b499eb3fc5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-003.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-width-shorthand-003.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-004.xht.ini
deleted file mode 100644
index 0978463135a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-shorthand-004.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-width-shorthand-004.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/css1/c5512-brdr-rw-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/css1/c5512-brdr-rw-001.xht.ini
deleted file mode 100644
index ad84fbeac64..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/css1/c5512-brdr-rw-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[c5512-brdr-rw-001.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/css1/c5514-brdr-lw-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/css1/c5514-brdr-lw-001.xht.ini
new file mode 100644
index 00000000000..f54a1e85c80
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/css1/c5514-brdr-lw-001.xht.ini
@@ -0,0 +1,2 @@
+[c5514-brdr-lw-001.xht]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/float-root.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/float-root.html.ini
deleted file mode 100644
index 20839ed35d4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/float-root.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[float-root.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-in-table-caption-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-in-table-caption-001.html.ini
deleted file mode 100644
index 86715ffc9c2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-in-table-caption-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[floats-in-table-caption-001.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-placement-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-placement-005.html.ini
deleted file mode 100644
index de2120a69a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-placement-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[floats-placement-005.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-placement-vertical-001a.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-placement-vertical-001a.xht.ini
deleted file mode 100644
index b0c8a8783e5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-placement-vertical-001a.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[floats-placement-vertical-001a.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule3-outside-right-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule3-outside-right-002.xht.ini
deleted file mode 100644
index cbad66d3a8f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule3-outside-right-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[floats-rule3-outside-right-002.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule7-outside-left-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule7-outside-left-001.xht.ini
deleted file mode 100644
index 8ed9f3c1a48..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule7-outside-left-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[floats-rule7-outside-left-001.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule7-outside-right-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule7-outside-right-001.xht.ini
deleted file mode 100644
index 0a1b241c746..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/floats-rule7-outside-right-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[floats-rule7-outside-right-001.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-004.xht.ini
deleted file mode 100644
index ecad8c49042..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-004.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline-formatting-context-004.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-005.xht.ini
deleted file mode 100644
index 75606e25449..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-005.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline-formatting-context-005.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-006.xht.ini
deleted file mode 100644
index e98a1b582c6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-formatting-context-006.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline-formatting-context-006.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-009.xht.ini
deleted file mode 100644
index e3e185f72d7..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-009.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-applies-to-009.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-012.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-012.xht.ini
deleted file mode 100644
index 162ed718db9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-012.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-applies-to-012.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-013.xht.ini
deleted file mode 100644
index 19cf7b55ad0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-013.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-applies-to-013.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-014.xht.ini
deleted file mode 100644
index 5d386a85a78..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-014.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-applies-to-014.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-015.xht.ini
deleted file mode 100644
index 3ae58568fa5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-applies-to-015.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-applies-to-015.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-007.xht.ini
new file mode 100644
index 00000000000..5588de4fd21
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-007.xht.ini
@@ -0,0 +1,2 @@
+[padding-applies-to-007.xht]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-009.xht.ini
deleted file mode 100644
index e93c47666d5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-009.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[padding-applies-to-009.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-012.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-012.xht.ini
deleted file mode 100644
index 6bc19b6ba7c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-012.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[padding-applies-to-012.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-013.xht.ini
new file mode 100644
index 00000000000..6b9d38d2e1e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-013.xht.ini
@@ -0,0 +1,2 @@
+[padding-applies-to-013.xht]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-014.xht.ini
new file mode 100644
index 00000000000..718a35d1ea8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-014.xht.ini
@@ -0,0 +1,2 @@
+[padding-applies-to-014.xht]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-015.xht.ini
deleted file mode 100644
index d8aa2ff7141..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/padding-applies-to-015.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[padding-applies-to-015.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-margins-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-margins-004.html.ini
deleted file mode 100644
index c951562bd42..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-margins-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-in-inline-margins-004.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/width-non-replaced-inline-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/width-non-replaced-inline-001.xht.ini
deleted file mode 100644
index 4890f7308ad..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/width-non-replaced-inline-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[width-non-replaced-inline-001.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-009.xht.ini
deleted file mode 100644
index eb5fc34231c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-009.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[abspos-009.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/white-space-processing-048.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/white-space-processing-048.xht.ini
deleted file mode 100644
index d6fae45ecb0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/text/white-space-processing-048.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[white-space-processing-048.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-gradient-subpixel-fills-area.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-gradient-subpixel-fills-area.html.ini
deleted file mode 100644
index ab5470796fa..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-gradient-subpixel-fills-area.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-gradient-subpixel-fills-area.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
deleted file mode 100644
index f20284a5396..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-repeat-round-roundup.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini
deleted file mode 100644
index 4b5a1e966ea..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-repeat-round.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-space.xht.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-space.xht.ini
deleted file mode 100644
index 5b13043f5c0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-repeat/background-repeat-space.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-repeat-space.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-overlapping-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-overlapping-002.html.ini
deleted file mode 100644
index 1998c8edb91..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/box-shadow-overlapping-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[box-shadow-overlapping-002.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/inline-opacity-float-child.html.ini b/tests/wpt/metadata-layout-2020/css/css-color/inline-opacity-float-child.html.ini
deleted file mode 100644
index 3d72383a475..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-color/inline-opacity-float-child.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline-opacity-float-child.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html.ini
new file mode 100644
index 00000000000..4e27baf9a1a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-justify-self-001.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html.ini
new file mode 100644
index 00000000000..3a6ed25d92d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html.ini
@@ -0,0 +1,2 @@
+[flex-abspos-staticpos-margin-001.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-006.html.ini
deleted file mode 100644
index bdb33aa2cb1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-column-006.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-007.html.ini
deleted file mode 100644
index f86dca39bce..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-column-007.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-009.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-009.html.ini
deleted file mode 100644
index f4822d75dbf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-009.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-column-009.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-intrinsics-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-intrinsics-001.html.ini
index c35db30bab8..112cf74da35 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-intrinsics-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-intrinsics-001.html.ini
@@ -28,3 +28,6 @@
[.flex-item 11]
expected: FAIL
+
+ [.flex-item 1]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-001.html.ini
deleted file mode 100644
index 237424b9fad..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-flow-001.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-004.html.ini
deleted file mode 100644
index d78c1695b9b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-flow-004.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-001.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-001.xht.ini
deleted file mode 100644
index 64861ab16fb..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-grow-001.xht]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse.html.ini
deleted file mode 100644
index 70541f0abb3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[multi-line-wrap-reverse-row-reverse.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse.html.ini
deleted file mode 100644
index 57dbc34d3dd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[multi-line-wrap-with-row-reverse.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-vertical-align-effect.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-vertical-align-effect.html.ini
new file mode 100644
index 00000000000..b1007b3f0f9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-vertical-align-effect.html.ini
@@ -0,0 +1,2 @@
+[flex-vertical-align-effect.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini
deleted file mode 100644
index 787758ff28e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-break-request-horiz-002a.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini
deleted file mode 100644
index 8ee43106a11..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-break-request-horiz-002b.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-iframe-intrinsic-size-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-iframe-intrinsic-size-001.html.ini
deleted file mode 100644
index 352635695fe..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-iframe-intrinsic-size-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-iframe-intrinsic-size-001.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-001.html.ini
deleted file mode 100644
index fd6fa5c3057..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-overflow-horiz-001.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini
deleted file mode 100644
index 9b2276474c2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-sizing-horiz-001.xhtml]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-007.html.ini
deleted file mode 100644
index 3ac05b502c3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-writing-mode-007.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-016.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-016.html.ini
new file mode 100644
index 00000000000..8b4582a2fc2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-016.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-016.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc.html.ini
new file mode 100644
index 00000000000..3672dbc441e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc.html.ini
@@ -0,0 +1,2 @@
+[flexbox_fbfc.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-formatting-interop.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-formatting-interop.html.ini
deleted file mode 100644
index 0a5916356e7..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-formatting-interop.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-formatting-interop.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-variable-auto-basis.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-variable-auto-basis.html.ini
deleted file mode 100644
index cedfbc2a82a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-variable-auto-basis.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-natural-variable-auto-basis.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-variable-zero-basis.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-variable-zero-basis.html.ini
deleted file mode 100644
index e56de1f97ae..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-variable-zero-basis.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-natural-variable-zero-basis.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated.html.ini
deleted file mode 100644
index c91ef0f0185..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_generated.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini
deleted file mode 100644
index cf3481ffbfc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_item-bottom-float.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-float.html.ini
deleted file mode 100644
index 86a3f1e3b56..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-float.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-float.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexible-order.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexible-order.html.ini
deleted file mode 100644
index 788f10d4854..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexible-order.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexible-order.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/order/order-with-row-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/order/order-with-row-reverse.html.ini
deleted file mode 100644
index 61e228b2f03..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/order/order-with-row-reverse.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[order-with-row-reverse.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini
new file mode 100644
index 00000000000..78e4433fc14
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini
@@ -0,0 +1,2 @@
+[overflow-area-001.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini
new file mode 100644
index 00000000000..5b1a9bb41ad
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini
@@ -0,0 +1,2 @@
+[overflow-area-002.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-float-paint.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-float-paint.html.ini
deleted file mode 100644
index ff87f3cd7c9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-float-paint.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[table-with-float-paint.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-logical/animations/float-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-logical/animations/float-interpolation.html.ini
index 8f875f87211..a25c63feaef 100644
--- a/tests/wpt/metadata-layout-2020/css/css-logical/animations/float-interpolation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-logical/animations/float-interpolation.html.ini
@@ -1,25 +1,4 @@
[float-interpolation.html]
- [CSS Transitions: property <float> from [left\] to [right\] at (-0.3) should be [left\]]
- expected: FAIL
-
- [CSS Transitions: property <float> from [left\] to [right\] at (0) should be [left\]]
- expected: FAIL
-
- [CSS Transitions: property <float> from [left\] to [right\] at (0.3) should be [left\]]
- expected: FAIL
-
- [CSS Transitions: property <float> from [left\] to [right\] at (0.5) should be [right\]]
- expected: FAIL
-
- [CSS Transitions: property <float> from [left\] to [right\] at (0.6) should be [right\]]
- expected: FAIL
-
- [CSS Transitions: property <float> from [left\] to [right\] at (1) should be [right\]]
- expected: FAIL
-
- [CSS Transitions: property <float> from [left\] to [right\] at (1.5) should be [right\]]
- expected: FAIL
-
[CSS Transitions with transition: all: property <float> from [left\] to [right\] at (-0.3) should be [right\]]
expected: FAIL
@@ -29,39 +8,6 @@
[CSS Transitions with transition: all: property <float> from [left\] to [right\] at (0.3) should be [right\]]
expected: FAIL
- [CSS Transitions with transition: all: property <float> from [left\] to [right\] at (0.5) should be [right\]]
- expected: FAIL
-
- [CSS Transitions with transition: all: property <float> from [left\] to [right\] at (0.6) should be [right\]]
- expected: FAIL
-
- [CSS Transitions with transition: all: property <float> from [left\] to [right\] at (1) should be [right\]]
- expected: FAIL
-
- [CSS Transitions with transition: all: property <float> from [left\] to [right\] at (1.5) should be [right\]]
- expected: FAIL
-
- [CSS Animations: property <float> from [left\] to [right\] at (-0.3) should be [left\]]
- expected: FAIL
-
- [CSS Animations: property <float> from [left\] to [right\] at (0) should be [left\]]
- expected: FAIL
-
- [CSS Animations: property <float> from [left\] to [right\] at (0.3) should be [left\]]
- expected: FAIL
-
- [CSS Animations: property <float> from [left\] to [right\] at (0.5) should be [right\]]
- expected: FAIL
-
- [CSS Animations: property <float> from [left\] to [right\] at (0.6) should be [right\]]
- expected: FAIL
-
- [CSS Animations: property <float> from [left\] to [right\] at (1) should be [right\]]
- expected: FAIL
-
- [CSS Animations: property <float> from [left\] to [right\] at (1.5) should be [right\]]
- expected: FAIL
-
[Web Animations: property <float> from [left\] to [right\] at (-0.3) should be [left\]]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-1.html.ini b/tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-1.html.ini
new file mode 100644
index 00000000000..5401378c440
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-1.html.ini
@@ -0,0 +1,2 @@
+[logical-values-float-clear-1.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-2.html.ini
new file mode 100644
index 00000000000..889d5dc5891
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-2.html.ini
@@ -0,0 +1,2 @@
+[logical-values-float-clear-2.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-reftest.html.ini b/tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-reftest.html.ini
new file mode 100644
index 00000000000..626ab3427a5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-logical/logical-values-float-clear-reftest.html.ini
@@ -0,0 +1,2 @@
+[logical-values-float-clear-reftest.html]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-position/position-absolute-chrome-bug-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-position/position-absolute-chrome-bug-002.html.ini
deleted file mode 100644
index 9ad9baef85c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-position/position-absolute-chrome-bug-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[position-absolute-chrome-bug-002.html]
- [#target position is recalculated correctly.]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-origin-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-origin-013.html.ini
deleted file mode 100644
index 6ad96745b0b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-origin-013.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[transform-origin-013.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-ui/outline-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-ui/outline-003.html.ini
deleted file mode 100644
index e3b1208d3f6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-ui/outline-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[outline-003.html]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryListEvent.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryListEvent.html.ini
deleted file mode 100644
index a49e2ee83fd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryListEvent.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[MediaQueryListEvent.html]
- [constructor of "change" event]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom/serialize-media-rule.html.ini b/tests/wpt/metadata-layout-2020/css/cssom/serialize-media-rule.html.ini
index 08e129d0361..baeae201147 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom/serialize-media-rule.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom/serialize-media-rule.html.ini
@@ -5,9 +5,6 @@
[features - lexicographical sorting]
expected: FAIL
- [one rule]
- expected: FAIL
-
[type - omission of all]
expected: FAIL
@@ -17,8 +14,5 @@
[type - inclusion of negated all]
expected: FAIL
- [many rules]
- expected: FAIL
-
[features - no lexicographical sorting]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom/serialize-values.html.ini b/tests/wpt/metadata-layout-2020/css/cssom/serialize-values.html.ini
index 817f6cbe6e7..2ea3298c4cc 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom/serialize-values.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom/serialize-values.html.ini
@@ -161,21 +161,6 @@
[caption-side: inherit]
expected: FAIL
- [clear: none]
- expected: FAIL
-
- [clear: left]
- expected: FAIL
-
- [clear: right]
- expected: FAIL
-
- [clear: both]
- expected: FAIL
-
- [clear: inherit]
- expected: FAIL
-
[content: counter(par-num)]
expected: FAIL
@@ -230,18 +215,6 @@
[empty-cells: inherit]
expected: FAIL
- [float: left]
- expected: FAIL
-
- [float: right]
- expected: FAIL
-
- [float: none]
- expected: FAIL
-
- [float: inherit]
- expected: FAIL
-
[font-variant: normal]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/filter-effects/filtered-inline-applies-to-float.html.ini b/tests/wpt/metadata-layout-2020/css/filter-effects/filtered-inline-applies-to-float.html.ini
deleted file mode 100644
index 0ef58fc011c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/filter-effects/filtered-inline-applies-to-float.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[filtered-inline-applies-to-float.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/__dir__.ini b/tests/wpt/mozilla/meta-layout-2020/css/__dir__.ini
deleted file mode 100644
index 43a774a6216..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: ["layout.floats.enabled:true"]
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/absolute_block_format_ctx.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/absolute_block_format_ctx.html.ini
deleted file mode 100644
index 332ed5777ee..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/absolute_block_format_ctx.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[absolute_block_format_ctx.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/absolute_hypothetical_float.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/absolute_hypothetical_float.html.ini
new file mode 100644
index 00000000000..290204b3777
--- /dev/null
+++ b/tests/wpt/mozilla/meta-layout-2020/css/absolute_hypothetical_float.html.ini
@@ -0,0 +1,2 @@
+[absolute_hypothetical_float.html]
+ expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/background_position_shorthand.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/background_position_shorthand.html.ini
deleted file mode 100644
index 032c59f959f..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/background_position_shorthand.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background_position_shorthand.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/background_repeat_both_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/background_repeat_both_a.html.ini
deleted file mode 100644
index b2ac1e22aa4..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/background_repeat_both_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background_repeat_both_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_a.html.ini
deleted file mode 100644
index 766e4b3cd9d..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block_formatting_context_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_cleared_float_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_cleared_float_a.html.ini
deleted file mode 100644
index 6248b681b95..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_cleared_float_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block_formatting_context_cleared_float_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_complex_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_complex_a.html.ini
deleted file mode 100644
index 5498e467c6e..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_complex_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block_formatting_context_complex_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_float_inorder_interaction_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_float_inorder_interaction_a.html.ini
deleted file mode 100644
index d4170437ae9..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_float_inorder_interaction_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block_formatting_context_float_inorder_interaction_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_relative_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_relative_a.html.ini
deleted file mode 100644
index 27d6a36d72e..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_relative_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block_formatting_context_relative_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_translation_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_translation_a.html.ini
deleted file mode 100644
index 787730d24d0..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/block_formatting_context_translation_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block_formatting_context_translation_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/box_sizing_sanity_check_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/box_sizing_sanity_check_a.html.ini
deleted file mode 100644
index 4b2eb3c32dc..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/box_sizing_sanity_check_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[box_sizing_sanity_check_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/content_color.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/content_color.html.ini
new file mode 100644
index 00000000000..be83973c5a3
--- /dev/null
+++ b/tests/wpt/mozilla/meta-layout-2020/css/content_color.html.ini
@@ -0,0 +1,2 @@
+[content_color.html]
+ expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/first_child_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/first_child_pseudo_a.html.ini
deleted file mode 100644
index d3a6e42c59e..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/first_child_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[first_child_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/first_of_type_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/first_of_type_pseudo_a.html.ini
deleted file mode 100644
index a00dc9daf30..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/first_of_type_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[first_of_type_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/fixed_width_overrides_child_intrinsic_width_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/fixed_width_overrides_child_intrinsic_width_a.html.ini
deleted file mode 100644
index 85e60ef47e5..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/fixed_width_overrides_child_intrinsic_width_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fixed_width_overrides_child_intrinsic_width_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/flex_nochild.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/flex_nochild.html.ini
new file mode 100644
index 00000000000..ba2d6bd339e
--- /dev/null
+++ b/tests/wpt/mozilla/meta-layout-2020/css/flex_nochild.html.ini
@@ -0,0 +1,2 @@
+[flex_nochild.html]
+ expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/float_intrinsic_width_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/float_intrinsic_width_a.html.ini
deleted file mode 100644
index ba41eb4f1be..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/float_intrinsic_width_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[float_intrinsic_width_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/float_right_intrinsic_width_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/float_right_intrinsic_width_a.html.ini
deleted file mode 100644
index 6416444b2df..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/float_right_intrinsic_width_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[float_right_intrinsic_width_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/float_under_top_margin_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/float_under_top_margin_a.html.ini
deleted file mode 100644
index 4ff77391b71..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/float_under_top_margin_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[float_under_top_margin_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/floated_list_item_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/floated_list_item_a.html.ini
deleted file mode 100644
index 0b72c548d71..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/floated_list_item_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[floated_list_item_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/floated_negative_margins_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/floated_negative_margins_a.html.ini
deleted file mode 100644
index 318e3cca6ea..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/floated_negative_margins_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[floated_negative_margins_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/img_width_style_intrinsic_width_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/img_width_style_intrinsic_width_a.html.ini
deleted file mode 100644
index f5f946cfcdc..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/img_width_style_intrinsic_width_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[img_width_style_intrinsic_width_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/incremental_float_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/incremental_float_a.html.ini
deleted file mode 100644
index 49abdc5cab9..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/incremental_float_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[incremental_float_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/inline_block_parent_padding_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/inline_block_parent_padding_a.html.ini
deleted file mode 100644
index 58a83270642..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/inline_block_parent_padding_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline_block_parent_padding_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/inline_element_border_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/inline_element_border_a.html.ini
deleted file mode 100644
index f4cdd05802d..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/inline_element_border_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline_element_border_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/intrinsic_border_box.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/intrinsic_border_box.html.ini
deleted file mode 100644
index fc40b2cc92b..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/intrinsic_border_box.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic_border_box.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/last_child_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/last_child_pseudo_a.html.ini
deleted file mode 100644
index 58734a20997..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/last_child_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[last_child_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/last_of_type_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/last_of_type_pseudo_a.html.ini
deleted file mode 100644
index b96002a4a13..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/last_of_type_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[last_of_type_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/negative_margin_uncle_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/negative_margin_uncle_a.html.ini
deleted file mode 100644
index 2e06085fa09..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/negative_margin_uncle_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[negative_margin_uncle_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/nth_child_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/nth_child_pseudo_a.html.ini
deleted file mode 100644
index 1c7622d3563..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/nth_child_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[nth_child_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/nth_last_child_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/nth_last_child_pseudo_a.html.ini
deleted file mode 100644
index 56966cd3d78..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/nth_last_child_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[nth_last_child_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/nth_last_of_type_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/nth_last_of_type_pseudo_a.html.ini
deleted file mode 100644
index 94178c8d4d1..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/nth_last_of_type_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[nth_last_of_type_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/nth_of_type_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/nth_of_type_pseudo_a.html.ini
deleted file mode 100644
index f8216f754f9..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/nth_of_type_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[nth_of_type_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/only_child_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/only_child_pseudo_a.html.ini
deleted file mode 100644
index 5d9266f67b9..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/only_child_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[only_child_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/only_of_type_pseudo_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/only_of_type_pseudo_a.html.ini
deleted file mode 100644
index 8a6734a8266..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/only_of_type_pseudo_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[only_of_type_pseudo_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/percentage_height_float_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/percentage_height_float_a.html.ini
deleted file mode 100644
index 81adaf011d0..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/percentage_height_float_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[percentage_height_float_a.html]
- expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/table_float_translation_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/table_float_translation_a.html.ini
deleted file mode 100644
index dfe4ec5cf4d..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/table_float_translation_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[table_float_translation_a.html]
- expected: FAIL