Make Layout 2013 style a superset of Layout 2020 style

This is the first step toward removing the compile-time difference in
style between Layout 2020 and Layout 2013.

97 files changed, 32 insertions, 349 deletions

diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index c3ebed7d1a3..d9531be391f 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -73,6 +73,7 @@ use style::selector_parser::{PseudoElement, RestyleDamage};
 use style::servo::restyle_damage::ServoRestyleDamage;
 use style::values::computed::Image;
 use style::values::generics::counters::ContentItem;
+use style::LocalName;
 
 /// The results of flow construction for a DOM node.
 #[derive(Clone)]
@@ -865,6 +866,15 @@ where
                                 Box::new(UnscannedTextFragmentInfo::new(string.into(), None));
                             SpecificFragmentInfo::UnscannedText(info)
                         },
+                        ContentItem::Attr(attr) => {
+                            let element = node.as_element().expect("Expected an element");
+                            let attr_val = element
+                                .get_attr(&attr.namespace_url, &LocalName::from(&*attr.attribute));
+                            let string = attr_val.map_or("".to_string(), |s| s.to_string());
+                            let info =
+                                Box::new(UnscannedTextFragmentInfo::new(string.into(), None));
+                            SpecificFragmentInfo::UnscannedText(info)
+                        },
                         content_item => {
                             let content_item =
                                 Box::new(GeneratedContentInfo::ContentItem(content_item));
diff --git a/components/layout/generated_content.rs b/components/layout/generated_content.rs
index 89f65732761..90e17fe3e8c 100644
--- a/components/layout/generated_content.rs
+++ b/components/layout/generated_content.rs
@@ -198,10 +198,6 @@ impl<'a, 'b> ResolveGeneratedContentFragmentMutator<'a, 'b> {
                         RenderingMode::Suffix(".\u{00a0}"),
                     )
                 },
-                GeneratedContentInfo::Empty |
-                GeneratedContentInfo::ContentItem(ContentItem::String(_)) => {
-                    // Nothing to do here.
-                },
                 GeneratedContentInfo::ContentItem(ContentItem::Counter(
                     ref counter_name,
                     counter_style,
@@ -272,8 +268,11 @@ impl<'a, 'b> ResolveGeneratedContentFragmentMutator<'a, 'b> {
                         self.traversal.quote -= 1
                     }
                 },
+                GeneratedContentInfo::Empty |
+                GeneratedContentInfo::ContentItem(ContentItem::String(_)) |
+                GeneratedContentInfo::ContentItem(ContentItem::Attr(_)) |
                 GeneratedContentInfo::ContentItem(ContentItem::Image(..)) => {
-                    unreachable!("Servo doesn't parse content: url(..) nor image-set(..) yet")
+                    // Nothing to do here.
                 },
             }
         };
diff --git a/components/style/properties/longhands/column.mako.rs b/components/style/properties/longhands/column.mako.rs
index 3907cbf5f05..a5bfc409d76 100644
--- a/components/style/properties/longhands/column.mako.rs
+++ b/components/style/properties/longhands/column.mako.rs
@@ -67,7 +67,7 @@ ${helpers.predefined_type(
 ${helpers.single_keyword(
     "column-span",
     "none all",
-    engines="gecko servo-2020",
+    engines="gecko servo-2013 servo-2020",
     servo_2020_pref="layout.2020.unimplemented",
     animation_value_type="discrete",
     gecko_enum_prefix="StyleColumnSpan",
diff --git a/components/style/properties/longhands/text.mako.rs b/components/style/properties/longhands/text.mako.rs
index 1660ed5c58e..f5ec2ea47be 100644
--- a/components/style/properties/longhands/text.mako.rs
+++ b/components/style/properties/longhands/text.mako.rs
@@ -41,7 +41,7 @@ ${helpers.predefined_type(
 ${helpers.single_keyword(
     "text-decoration-style",
     "solid double dotted dashed wavy -moz-none",
-    engines="gecko servo-2020",
+    engines="gecko servo-2013 servo-2020",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-style",
 )}
@@ -50,7 +50,7 @@ ${helpers.predefined_type(
     "text-decoration-color",
     "Color",
     "computed_value::T::currentcolor()",
-    engines="gecko servo-2020",
+    engines="gecko servo-2013 servo-2020",
     initial_specified_value="specified::Color::currentcolor()",
     animation_value_type="AnimatedColor",
     ignored_when_colors_disabled=True,
diff --git a/components/style/values/generics/counters.rs b/components/style/values/generics/counters.rs
index 2d9948cef4a..8b45124fc4c 100644
--- a/components/style/values/generics/counters.rs
+++ b/components/style/values/generics/counters.rs
@@ -8,7 +8,6 @@
 use crate::computed_values::list_style_type::T as ListStyleType;
 #[cfg(feature = "gecko")]
 use crate::values::generics::CounterStyle;
-#[cfg(any(feature = "gecko", feature = "servo-layout-2020"))]
 use crate::values::specified::Attr;
 use crate::values::CustomIdent;
 use std::fmt::{self, Write};
@@ -272,7 +271,6 @@ pub enum GenericContentItem<I> {
     #[cfg(feature = "gecko")]
     MozAltContent,
     /// `attr([namespace? `|`]? ident)`
-    #[cfg(any(feature = "gecko", feature = "servo-layout-2020"))]
     Attr(Attr),
     /// image-set(url) | url(url)
     Image(I),
diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index e503e8a2f16..caafb9c83f6 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -72,7 +72,6 @@ pub enum DisplayOutside {
 #[repr(u8)]
 pub enum DisplayInside {
     None = 0,
-    #[cfg(any(feature = "servo-layout-2020", feature = "gecko"))]
     Contents,
     Flow,
     FlowRoot,
@@ -142,7 +141,6 @@ impl Display {
 
     /// https://drafts.csswg.org/css-display/#the-display-properties
     pub const None: Self = Self::new(DisplayOutside::None, DisplayInside::None);
-    #[cfg(any(feature = "servo-layout-2020", feature = "gecko"))]
     pub const Contents: Self = Self::new(DisplayOutside::None, DisplayInside::Contents);
     pub const Inline: Self = Self::new(DisplayOutside::Inline, DisplayInside::Flow);
     pub const InlineBlock: Self = Self::new(DisplayOutside::Inline, DisplayInside::FlowRoot);
@@ -352,7 +350,6 @@ impl Display {
     ///
     /// Also used for :root style adjustments.
     pub fn equivalent_block_display(&self, _is_root_element: bool) -> Self {
-        #[cfg(any(feature = "servo-layout-2020", feature = "gecko"))]
         {
             // Special handling for `contents` and `list-item`s on the root element.
             if _is_root_element && (self.is_contents() || self.is_list_item()) {
@@ -398,7 +395,6 @@ impl Display {
     #[inline]
     pub fn is_contents(&self) -> bool {
         match *self {
-            #[cfg(any(feature = "servo-layout-2020", feature = "gecko"))]
             Display::Contents => true,
             _ => false,
         }
@@ -463,7 +459,6 @@ fn parse_display_inside<'i, 't>(
     Ok(try_match_ident_ignore_ascii_case! { input,
         "flow" => DisplayInside::Flow,
         "flex" if flexbox_enabled() => DisplayInside::Flex,
-        #[cfg(any(feature = "servo-layout-2020", feature = "gecko"))]
         "flow-root" => DisplayInside::FlowRoot,
         #[cfg(any(feature = "servo-layout-2013", feature = "gecko"))]
         "table" => DisplayInside::Table,
@@ -562,7 +557,6 @@ impl Parse for Display {
         // Now parse the single-keyword `display` values.
         Ok(try_match_ident_ignore_ascii_case! { input,
             "none" => Display::None,
-            #[cfg(any(feature = "servo-layout-2020", feature = "gecko"))]
             "contents" => Display::Contents,
             "inline-block" => Display::InlineBlock,
             #[cfg(any(feature = "servo-layout-2013", feature = "gecko"))]
diff --git a/components/style/values/specified/counters.rs b/components/style/values/specified/counters.rs
index 91fd7e77078..676da556ec7 100644
--- a/components/style/values/specified/counters.rs
+++ b/components/style/values/specified/counters.rs
@@ -12,7 +12,6 @@ use crate::values::generics::counters::CounterPair;
 #[cfg(feature = "gecko")]
 use crate::values::generics::CounterStyle;
 use crate::values::specified::image::Image;
-#[cfg(any(feature = "gecko", feature = "servo-layout-2020"))]
 use crate::values::specified::Attr;
 use crate::values::specified::Integer;
 use crate::values::CustomIdent;
@@ -202,7 +201,6 @@ impl Parse for Content {
         let mut content = vec![];
         let mut has_alt_content = false;
         loop {
-            #[cfg(any(feature = "gecko", feature = "servo-layout-2020"))]
             {
                 if let Ok(image) = input.try_parse(|i| Image::parse_only_url(context, i)) {
                     content.push(generics::ContentItem::Image(image));
@@ -233,7 +231,6 @@ impl Parse for Content {
                             let style = Content::parse_counter_style(context, input);
                             Ok(generics::ContentItem::Counters(name, separator, style))
                         }),
-                        #[cfg(any(feature = "gecko", feature = "servo-layout-2020"))]
                         "attr" => input.parse_nested_block(|input| {
                             Ok(generics::ContentItem::Attr(Attr::parse_function(context, input)?))
                         }),
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-037.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-037.xht.ini
deleted file mode 100644
index 8d581a62d55..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-037.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-037.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-038.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-038.xht.ini
deleted file mode 100644
index 55dbc005478..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-038.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-038.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-039.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-039.xht.ini
deleted file mode 100644
index 914b3392422..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-039.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-039.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-040.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-040.xht.ini
deleted file mode 100644
index 1574f541d85..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-040.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-040.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-041.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-041.xht.ini
deleted file mode 100644
index 6c4ed008895..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-041.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-041.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-042.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-042.xht.ini
deleted file mode 100644
index be86618b552..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-042.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-042.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-043.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-043.xht.ini
deleted file mode 100644
index 0548440f58a..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-043.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-043.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-046.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-046.xht.ini
deleted file mode 100644
index 77b3181f52f..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-046.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-046.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-047.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-047.xht.ini
deleted file mode 100644
index b2e2661878e..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-047.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-047.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-048.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-048.xht.ini
deleted file mode 100644
index f59c49831af..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-048.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-048.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-052.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-052.xht.ini
deleted file mode 100644
index d97829257fd..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-052.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-052.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-053.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-053.xht.ini
deleted file mode 100644
index f563db1b2ed..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-053.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-053.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-054.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-054.xht.ini
deleted file mode 100644
index 4f9cbcc7586..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-054.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-054.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-057.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-057.xht.ini
deleted file mode 100644
index 3cd26ca3bc8..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-057.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-057.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-063.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-063.xht.ini
deleted file mode 100644
index 72352e9b5a8..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-063.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-063.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-065.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-065.xht.ini
deleted file mode 100644
index 2b7544e293c..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-065.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-065.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-067.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-067.xht.ini
deleted file mode 100644
index 69df6c0eee6..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-067.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-067.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-068.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-068.xht.ini
deleted file mode 100644
index fac5b5d46f4..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-068.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-068.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-070.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-070.xht.ini
deleted file mode 100644
index 397ef880c7e..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-070.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-070.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-072.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-072.xht.ini
deleted file mode 100644
index 1a48e77c1ca..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-072.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-072.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-073.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-073.xht.ini
deleted file mode 100644
index 64f361a4929..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-073.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-073.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-075.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-075.xht.ini
deleted file mode 100644
index 8d777f9e0cc..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-075.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-075.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-076.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-076.xht.ini
deleted file mode 100644
index 5c7f2cdc4d8..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-076.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-076.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-077.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-077.xht.ini
deleted file mode 100644
index bb0c2878460..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-077.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-077.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-080.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-080.xht.ini
deleted file mode 100644
index 24fca12d0dd..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-080.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-080.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-081.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-081.xht.ini
deleted file mode 100644
index b7e84a0ae3d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-081.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-081.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-082.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-082.xht.ini
deleted file mode 100644
index b7fe80a3612..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-082.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-082.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-083.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-083.xht.ini
deleted file mode 100644
index 98d9750ca56..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-083.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-083.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-085.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-085.xht.ini
deleted file mode 100644
index c36c5f28065..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-085.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-085.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-086.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-086.xht.ini
deleted file mode 100644
index 4bcc74b9e98..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-086.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-086.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-089.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-089.xht.ini
deleted file mode 100644
index 9be53ac8af7..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-089.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-089.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-090.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-090.xht.ini
deleted file mode 100644
index 8f692e0192e..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-090.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-090.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-091.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-091.xht.ini
deleted file mode 100644
index 8c44f8a727e..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-091.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-091.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-096.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-096.xht.ini
deleted file mode 100644
index e290d19a5d7..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-096.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-096.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-097.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-097.xht.ini
deleted file mode 100644
index 17fe2fa1b34..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-097.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-097.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-099.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-099.xht.ini
deleted file mode 100644
index eee1288f410..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-099.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-099.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-100.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-100.xht.ini
deleted file mode 100644
index 639d5fcdc8d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-100.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-100.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-103.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-103.xht.ini
deleted file mode 100644
index 7df6c41cff5..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-103.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-103.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-105.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-105.xht.ini
deleted file mode 100644
index 29fae9eec9e..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-105.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-105.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-107.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-107.xht.ini
deleted file mode 100644
index 581fa1cc197..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-107.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-107.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-108.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-108.xht.ini
deleted file mode 100644
index 360e08139fd..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-108.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-108.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-109.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-109.xht.ini
deleted file mode 100644
index 3fed7d41624..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-109.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-109.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-110.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-110.xht.ini
deleted file mode 100644
index 03165be3d78..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-110.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-110.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-111.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-111.xht.ini
deleted file mode 100644
index 8e70546c553..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-111.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-111.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-112.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-112.xht.ini
deleted file mode 100644
index 3f5438d5f66..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-112.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-112.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-113.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-113.xht.ini
deleted file mode 100644
index 13bd3922dbb..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-113.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-113.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-114.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-114.xht.ini
deleted file mode 100644
index b993d213da8..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-114.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-114.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-115.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-115.xht.ini
deleted file mode 100644
index 328810911a5..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-115.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-115.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-116.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-116.xht.ini
deleted file mode 100644
index 87381c67365..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-116.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-116.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-117.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-117.xht.ini
deleted file mode 100644
index b2bb6e8ec4a..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-117.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-117.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-118.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-118.xht.ini
deleted file mode 100644
index a10fde01f72..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-118.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-118.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-119.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-119.xht.ini
deleted file mode 100644
index 9f360c0ec60..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-119.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-119.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-121.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-121.xht.ini
deleted file mode 100644
index 0f761cfd41c..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-121.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[content-121.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-122.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-122.xht.ini
deleted file mode 100644
index 82275f32b5f..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-122.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-122.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-123.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-123.xht.ini
deleted file mode 100644
index 87d67c7ed86..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-123.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-123.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-126.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-126.xht.ini
deleted file mode 100644
index 309532c3473..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-126.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-126.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-127.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-127.xht.ini
deleted file mode 100644
index e91e9bc86ed..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-127.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-127.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-129.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-129.xht.ini
deleted file mode 100644
index 176fb737186..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-129.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-129.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-131.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-131.xht.ini
deleted file mode 100644
index d8fafac4a1f..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-131.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-131.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-132.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-132.xht.ini
deleted file mode 100644
index 018ba9b20de..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-132.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-132.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-135.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-135.xht.ini
deleted file mode 100644
index 7afbb752485..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-135.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-135.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-136.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-136.xht.ini
deleted file mode 100644
index 1c9ecc23cd1..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-136.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-136.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-138.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-138.xht.ini
deleted file mode 100644
index f27ea134f5a..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-138.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-138.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-141.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-141.xht.ini
deleted file mode 100644
index 3ceb8673e6a..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-141.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-141.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-143.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-143.xht.ini
deleted file mode 100644
index 3bbf03acd0f..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-143.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-143.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-144.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-144.xht.ini
deleted file mode 100644
index d13329af770..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-144.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-144.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-145.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-145.xht.ini
deleted file mode 100644
index fd45b0a544a..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-145.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-145.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-146.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-146.xht.ini
deleted file mode 100644
index dbf1acbb8bf..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-146.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-146.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-147.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-147.xht.ini
deleted file mode 100644
index 1d1b252a89c..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-147.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-147.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-149.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-149.xht.ini
deleted file mode 100644
index 1f2bcb42bb9..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-149.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-149.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-150.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-150.xht.ini
deleted file mode 100644
index 0c2f70e8202..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-150.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-150.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-152.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-152.xht.ini
deleted file mode 100644
index 5c40b2c07ab..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-152.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-152.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-153.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-153.xht.ini
deleted file mode 100644
index 42275aa9af4..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-153.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-153.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-155.xht.ini b/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-155.xht.ini
deleted file mode 100644
index bdfb2ac2935..00000000000
--- a/tests/wpt/meta-legacy-layout/css/CSS2/generated-content/content-155.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[content-155.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-conditional/at-supports-namespace-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-conditional/at-supports-namespace-001.html.ini
deleted file mode 100644
index 72d1a736a6b..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-conditional/at-supports-namespace-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[at-supports-namespace-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/animations/discrete-no-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/animations/discrete-no-interpolation.html.ini
index 039ac094349..f9c241fb8ea 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/animations/discrete-no-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/animations/discrete-no-interpolation.html.ini
@@ -38,18 +38,6 @@
   [CSS Transitions: property <text-decoration-style> from [initial\] to [dashed\] at (0.3) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions: property <text-decoration-style> from [initial\] to [dashed\] at (0.5) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Transitions: property <text-decoration-style> from [initial\] to [dashed\] at (0.6) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Transitions: property <text-decoration-style> from [initial\] to [dashed\] at (1) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Transitions: property <text-decoration-style> from [initial\] to [dashed\] at (1.5) should be [dashed\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <text-decoration-style> from [initial\] to [dashed\] at (-0.3) should be [dashed\]]
     expected: FAIL
 
@@ -59,39 +47,6 @@
   [CSS Transitions with transition: all: property <text-decoration-style> from [initial\] to [dashed\] at (0.3) should be [dashed\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <text-decoration-style> from [initial\] to [dashed\] at (0.5) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <text-decoration-style> from [initial\] to [dashed\] at (0.6) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <text-decoration-style> from [initial\] to [dashed\] at (1) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <text-decoration-style> from [initial\] to [dashed\] at (1.5) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Animations: property <text-decoration-style> from [initial\] to [dashed\] at (-0.3) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <text-decoration-style> from [initial\] to [dashed\] at (0) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <text-decoration-style> from [initial\] to [dashed\] at (0.3) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <text-decoration-style> from [initial\] to [dashed\] at (0.5) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Animations: property <text-decoration-style> from [initial\] to [dashed\] at (0.6) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Animations: property <text-decoration-style> from [initial\] to [dashed\] at (1) should be [dashed\]]
-    expected: FAIL
-
-  [CSS Animations: property <text-decoration-style> from [initial\] to [dashed\] at (1.5) should be [dashed\]]
-    expected: FAIL
-
   [Web Animations: property <text-decoration-style> from [initial\] to [dashed\] at (-0.3) should be [initial\]]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/inheritance.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/inheritance.html.ini
index 9526449cff1..58566e30618 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/inheritance.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/inheritance.html.ini
@@ -5,18 +5,12 @@
   [Property text-emphasis-style has initial value none]
     expected: FAIL
 
-  [Property text-decoration-style has initial value solid]
-    expected: FAIL
-
   [Property text-underline-position has initial value auto]
     expected: FAIL
 
   [Property text-emphasis-color has initial value rgba(2, 3, 4, 0.5)]
     expected: FAIL
 
-  [Property text-decoration-color has initial value rgba(2, 3, 4, 0.5)]
-    expected: FAIL
-
   [Property text-decoration-skip-ink inherits]
     expected: FAIL
 
@@ -29,15 +23,9 @@
   [Property text-emphasis-position inherits]
     expected: FAIL
 
-  [Property text-decoration-color does not inherit]
-    expected: FAIL
-
   [Property text-emphasis-position has initial value over right]
     expected: FAIL
 
-  [Property text-decoration-style does not inherit]
-    expected: FAIL
-
   [Property text-emphasis-color inherits]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-color-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-color-computed.html.ini
index 68354253576..188cd8f56e0 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-color-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-color-computed.html.ini
@@ -7,13 +7,3 @@
 
   [Property text-decoration-color value 'rgb(0, 0, 255)' computes to 'rgb(0, 0, 255)']
     expected: FAIL
-
-  [Property text-decoration-color value 'inherit']
-    expected: FAIL
-
-  [Property text-decoration-color value 'rgb(0, 0, 255)']
-    expected: FAIL
-
-  [Property text-decoration-color value 'currentcolor']
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-color-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-color-valid.html.ini
deleted file mode 100644
index 030a804ef83..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-color-valid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[text-decoration-color-valid.html]
-  [e.style['text-decoration-color'\] = "currentcolor" should set the property value]
-    expected: FAIL
-
-  [e.style['text-decoration-color'\] = "red" should set the property value]
-    expected: FAIL
-
-  [e.style['text-decoration-color'\] = "rgba(10, 20, 30, 0.4)" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-style-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-style-computed.html.ini
index 5cff5aa0b38..ecfc8ea7db2 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-style-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-style-computed.html.ini
@@ -13,19 +13,3 @@
 
   [Property text-decoration-style value 'dashed' computes to 'dashed']
     expected: FAIL
-
-  [Property text-decoration-style value 'wavy']
-    expected: FAIL
-
-  [Property text-decoration-style value 'double']
-    expected: FAIL
-
-  [Property text-decoration-style value 'dashed']
-    expected: FAIL
-
-  [Property text-decoration-style value 'dotted']
-    expected: FAIL
-
-  [Property text-decoration-style value 'solid']
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-style-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-style-valid.html.ini
deleted file mode 100644
index e21ef9d6735..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-style-valid.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[text-decoration-style-valid.html]
-  [e.style['text-decoration-style'\] = "wavy" should set the property value]
-    expected: FAIL
-
-  [e.style['text-decoration-style'\] = "solid" should set the property value]
-    expected: FAIL
-
-  [e.style['text-decoration-style'\] = "dotted" should set the property value]
-    expected: FAIL
-
-  [e.style['text-decoration-style'\] = "double" should set the property value]
-    expected: FAIL
-
-  [e.style['text-decoration-style'\] = "dashed" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-variables/variable-generated-content-dynamic-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-variables/variable-generated-content-dynamic-001.html.ini
deleted file mode 100644
index 3441d89421d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-variables/variable-generated-content-dynamic-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[variable-generated-content-dynamic-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-variables/variable-presentation-attribute.html.ini b/tests/wpt/meta-legacy-layout/css/css-variables/variable-presentation-attribute.html.ini
index 0b5119bc36d..77a0d137b93 100644
--- a/tests/wpt/meta-legacy-layout/css/css-variables/variable-presentation-attribute.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-variables/variable-presentation-attribute.html.ini
@@ -106,6 +106,3 @@
 
   [Testing 'writing-mode'.]
     expected: FAIL
-
-  [Testing 'text-decoration-style'.]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini b/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini
index 2869f684139..701fa2d1b31 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini
@@ -1,19 +1,7 @@
 [serialize-values.html]
-  [content: url("http://localhost/")]
-    expected: FAIL
-
-  [content: url(http://localhost/)]
-    expected: FAIL
-
   [content: counter(par-num, upper-roman)]
     expected: FAIL
 
-  [content: attr(foo-bar)]
-    expected: FAIL
-
-  [content: attr(foo_bar)]
-    expected: FAIL
-
   [list-style-type: decimal-leading-zero]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/dom/elements/the-innertext-and-outertext-properties/getter.html.ini b/tests/wpt/meta-legacy-layout/html/dom/elements/the-innertext-and-outertext-properties/getter.html.ini
index 0078fb61128..bd08ee19299 100644
--- a/tests/wpt/meta-legacy-layout/html/dom/elements/the-innertext-and-outertext-properties/getter.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/dom/elements/the-innertext-and-outertext-properties/getter.html.ini
@@ -745,3 +745,18 @@
 
   [Flex items blockified ("<div style='display:flex'><span>1</span><span>2</span></div>")]
     expected: FAIL
+
+  [display:contents container ("<div style='display:contents'>abc")]
+    expected: FAIL
+
+  [display:contents container ("<div><div style='display:contents'>abc")]
+    expected: FAIL
+
+  [display:contents rendered ("<div>123<span style='display:contents'>abc")]
+    expected: FAIL
+
+  [display:contents not processed via textContent ("<div style='display:contents'>   ")]
+    expected: FAIL
+
+  [display:contents not processed via textContent ("<div><div style='display:contents'>   ")]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini
index b740087c8a4..dc1c6102c16 100644
--- a/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini
@@ -32,9 +32,6 @@
   [fieldset with display: ruby]
     expected: FAIL
 
-  [fieldset with display: flow-root]
-    expected: FAIL
-
   [fieldset with display: ruby-base]
     expected: FAIL
 
@@ -58,4 +55,3 @@
 
   [fieldset with display: block ruby]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html.ini
index ab9d8cce0b7..ee3180d3f1c 100644
--- a/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html.ini
@@ -5,9 +5,6 @@
   [rendered legend with display: ruby-text-container]
     expected: FAIL
 
-  [rendered legend with display: flow-root]
-    expected: FAIL
-
   [rendered legend with display: table-column-group]
     expected: FAIL
 
@@ -116,9 +113,6 @@
   [rendered legend with display: ruby-text-container; columns:1]
     expected: FAIL
 
-  [rendered legend with display: flow-root; overflow:hidden;columns:1]
-    expected: FAIL
-
   [rendered legend with display: ruby-base; overflow:hidden;columns:1]
     expected: FAIL
 
@@ -152,9 +146,6 @@
   [rendered legend with display: table-row; overflow:hidden;columns:1]
     expected: FAIL
 
-  [rendered legend with display: flow-root; overflow:hidden]
-    expected: FAIL
-
   [rendered legend with display: inline-grid; columns:1]
     expected: FAIL
 
@@ -206,9 +197,6 @@
   [rendered legend with display: table-column; columns:1]
     expected: FAIL
 
-  [rendered legend with display: flow-root; columns:1]
-    expected: FAIL
-
   [rendered legend with display: table-caption; columns:1]
     expected: FAIL
 
@@ -286,4 +274,3 @@
 
   [rendered legend with display: table-cell; overflow:hidden]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/widgets/button-layout/computed-style.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/widgets/button-layout/computed-style.html.ini
index 91234731587..d7c26a41627 100644
--- a/tests/wpt/meta-legacy-layout/html/rendering/widgets/button-layout/computed-style.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/rendering/widgets/button-layout/computed-style.html.ini
@@ -1,7 +1,4 @@
 [computed-style.html]
-  [computed display of <input type=color> with display: flow-root]
-    expected: FAIL
-
   [computed display of <input type=submit> with display: ruby]
     expected: FAIL
 
@@ -53,9 +50,6 @@
   [computed display of <button type=submit> with display: ruby-text]
     expected: FAIL
 
-  [computed display of <button type=submit> with display: flow-root]
-    expected: FAIL
-
   [computed display of <input type=submit> with display: contents]
     expected: FAIL
 
@@ -77,9 +71,6 @@
   [computed display of <input type=color> with display: ruby]
     expected: FAIL
 
-  [computed display of <input type=submit> with display: flow-root]
-    expected: FAIL
-
   [computed display of <input type=color> with display: inline-grid]
     expected: FAIL
 
@@ -92,9 +83,6 @@
   [computed display of <input type=reset> with display: contents]
     expected: FAIL
 
-  [computed display of <input type=button> with display: flow-root]
-    expected: FAIL
-
   [computed display of <input type=color> with display: ruby-base]
     expected: FAIL
 
@@ -110,18 +98,12 @@
   [computed display of <input type=submit> with display: ruby-base]
     expected: FAIL
 
-  [computed display of <input type=reset> with display: flow-root]
-    expected: FAIL
-
   [computed display of <input type=button> with display: contents]
     expected: FAIL
 
   [computed display of <input type=submit> with display: ruby-text]
     expected: FAIL
 
-  [computed display of <button type=submit> with display: contents]
-    expected: FAIL
-
   [computed display of <input type=reset> with display: ruby-text]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/widgets/button-layout/display-other.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/widgets/button-layout/display-other.html.ini
index e8cfab84493..3f353437174 100644
--- a/tests/wpt/meta-legacy-layout/html/rendering/widgets/button-layout/display-other.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/rendering/widgets/button-layout/display-other.html.ini
@@ -20,9 +20,6 @@
   [display: table]
     expected: FAIL
 
-  [display: flow-root]
-    expected: FAIL
-
   [display: ruby-text-container]
     expected: FAIL
 
@@ -49,4 +46,3 @@
 
   [display: table-row]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/quirks/unitless-length/excluded-properties-002.html.ini b/tests/wpt/meta-legacy-layout/quirks/unitless-length/excluded-properties-002.html.ini
index 281646a1cd7..76d3c3ae881 100644
--- a/tests/wpt/meta-legacy-layout/quirks/unitless-length/excluded-properties-002.html.ini
+++ b/tests/wpt/meta-legacy-layout/quirks/unitless-length/excluded-properties-002.html.ini
@@ -5,9 +5,6 @@
   [Property clip-path does not support quirky length]
     expected: FAIL
 
-  [Property column-span does not support quirky length]
-    expected: FAIL
-
   [Property mask does not support quirky length]
     expected: FAIL