From 5acfce5b89d3795a2080e1d2ffd8479e9b10e12b Mon Sep 17 00:00:00 2001 From: Oriol Brufau Date: Wed, 10 Apr 2024 15:03:56 +0200 Subject: [PATCH] Upgrade Stylo to 2023-12-01 (#32032) * Upgrade Stylo to 2023-12-01 * Fixup for https://phabricator.services.mozilla.com/D191362 * Fixup for https://phabricator.services.mozilla.com/D191522 * Fixup for https://phabricator.services.mozilla.com/D191613 * Fixup for https://phabricator.services.mozilla.com/D191161 * Fixup for https://phabricator.services.mozilla.com/D191615 * Fixup for https://phabricator.services.mozilla.com/D193048 * Fixup for https://phabricator.services.mozilla.com/D193547 * Update test expectations --- Cargo.lock | 54 ++++++++++--------- Cargo.toml | 20 +++---- components/layout/block.rs | 1 + components/layout_2020/flow/inline.rs | 1 + tests/unit/style/custom_properties.rs | 24 +++++++-- tests/unit/style/stylist.rs | 5 +- ...ested-color-mix-with-currentcolor.html.ini | 3 -- ...color-computed-color-mix-function.html.ini | 33 ------------ .../parsing/color-valid-hsl.html.ini | 42 --------------- .../parsing/color-valid-hwb.html.ini | 33 ------------ .../css/css-logical/animation-002.html.ini | 24 ++++++++- .../viewport-units-extreme-scale.html.ini | 6 --- ...ested-color-mix-with-currentcolor.html.ini | 3 -- ...color-computed-color-mix-function.html.ini | 33 ------------ .../parsing/color-valid-hsl.html.ini | 42 --------------- .../parsing/color-valid-hwb.html.ini | 33 ------------ .../css/css-logical/animation-002.html.ini | 5 -- 17 files changed, 88 insertions(+), 274 deletions(-) delete mode 100644 tests/wpt/meta-legacy-layout/css/css-color/nested-color-mix-with-currentcolor.html.ini delete mode 100644 tests/wpt/meta-legacy-layout/css/css-values/viewport-units-extreme-scale.html.ini delete mode 100644 tests/wpt/meta/css/css-color/nested-color-mix-with-currentcolor.html.ini diff --git a/Cargo.lock b/Cargo.lock index e4b5c00aa15..7c8839b4543 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1080,13 +1080,12 @@ dependencies = [ [[package]] name = "cssparser" version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e" +source = "git+https://github.com/servo/rust-cssparser/?rev=aaa966d9d6ae70c4b8a62bb5e3a14c068bb7dff0#aaa966d9d6ae70c4b8a62bb5e3a14c068bb7dff0" dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.11.2", + "phf 0.10.1", "serde", "smallvec", ] @@ -1094,8 +1093,7 @@ dependencies = [ [[package]] name = "cssparser-macros" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +source = "git+https://github.com/servo/rust-cssparser/?rev=aaa966d9d6ae70c4b8a62bb5e3a14c068bb7dff0#aaa966d9d6ae70c4b8a62bb5e3a14c068bb7dff0" dependencies = [ "quote", "syn 2.0.58", @@ -1198,7 +1196,7 @@ dependencies = [ [[package]] name = "derive_common" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "darling", "proc-macro2", @@ -3448,7 +3446,7 @@ dependencies = [ [[package]] name = "malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "accountable-refcell", "app_units", @@ -4257,7 +4255,9 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ + "phf_macros", "phf_shared 0.10.0", + "proc-macro-hack", ] [[package]] @@ -4266,7 +4266,6 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros", "phf_shared 0.11.2", ] @@ -4312,15 +4311,16 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.11.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", "proc-macro2", "quote", - "syn 2.0.58", + "syn 1.0.109", ] [[package]] @@ -4461,6 +4461,12 @@ dependencies = [ "toml_edit", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + [[package]] name = "proc-macro2" version = "1.0.79" @@ -5061,7 +5067,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.24.0" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "bitflags 2.5.0", "cssparser", @@ -5349,7 +5355,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.2.0" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "nodrop", "serde", @@ -5359,7 +5365,7 @@ dependencies = [ [[package]] name = "servo_atoms" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "string_cache", "string_cache_codegen", @@ -5557,7 +5563,7 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "size_of_test" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "static_assertions", ] @@ -5683,7 +5689,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "static_prefs" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" [[package]] name = "strict-num" @@ -5720,7 +5726,7 @@ dependencies = [ [[package]] name = "style" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "app_units", "arrayvec", @@ -5779,7 +5785,7 @@ dependencies = [ [[package]] name = "style_config" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "lazy_static", ] @@ -5787,7 +5793,7 @@ dependencies = [ [[package]] name = "style_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "darling", "derive_common", @@ -5818,7 +5824,7 @@ dependencies = [ [[package]] name = "style_traits" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "app_units", "bitflags 2.5.0", @@ -6172,7 +6178,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "cssparser", "servo_arc", @@ -6185,7 +6191,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-10-16#644ff838e935648df315b8ed92e5b2b3737e711f" +source = "git+https://github.com/servo/stylo?branch=2023-12-01#f6ef64ece5d6966a50e7216248553349113bcbce" dependencies = [ "darling", "derive_common", diff --git a/Cargo.toml b/Cargo.toml index 295633a7a5d..4553f0294ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ compositing_traits = { path = "components/shared/compositing" } content-security-policy = { version = "0.5", features = ["serde"] } cookie = "0.12" crossbeam-channel = "0.5" -cssparser = { version = "0.33", features = ["serde"] } +cssparser = { version = "0.33", features = ["serde"], git = "https://github.com/servo/rust-cssparser/", rev = "aaa966d9d6ae70c4b8a62bb5e3a14c068bb7dff0" } darling = { version = "0.20", default-features = false } data-url = "0.1.0" devtools_traits = { path = "components/shared/devtools" } @@ -64,7 +64,7 @@ keyboard-types = "0.6" lazy_static = "1.4" libc = "0.2" log = "0.4" -malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2023-10-16", features = ["servo"] } +malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2023-12-01", features = ["servo"] } malloc_size_of_derive = "0.1" mime = "0.3.13" mime_guess = "2.0.3" @@ -87,31 +87,31 @@ rustls = { version = "0.21.10", features = ["dangerous_configuration"] } rustls-pemfile = "1.0.4" script_layout_interface = { path = "components/shared/script_layout" } script_traits = { path = "components/shared/script" } -selectors = { git = "https://github.com/servo/stylo", branch = "2023-10-16" } +selectors = { git = "https://github.com/servo/stylo", branch = "2023-12-01" } serde = "1.0.197" serde_bytes = "0.11" serde_json = "1.0" servo-media = { git = "https://github.com/servo/media" } servo-media-dummy = { git = "https://github.com/servo/media" } servo-media-gstreamer = { git = "https://github.com/servo/media" } -servo_arc = { git = "https://github.com/servo/stylo", branch = "2023-10-16" } -servo_atoms = { git = "https://github.com/servo/stylo", branch = "2023-10-16" } -size_of_test = { git = "https://github.com/servo/stylo", branch = "2023-10-16" } +servo_arc = { git = "https://github.com/servo/stylo", branch = "2023-12-01" } +servo_atoms = { git = "https://github.com/servo/stylo", branch = "2023-12-01" } +size_of_test = { git = "https://github.com/servo/stylo", branch = "2023-12-01" } smallbitvec = "2.5.3" smallvec = "1.13" sparkle = "0.1.26" string_cache = "0.8" string_cache_codegen = "0.5" -style = { git = "https://github.com/servo/stylo", branch = "2023-10-16", features = ["servo"] } -style_config = { git = "https://github.com/servo/stylo", branch = "2023-10-16" } -style_traits = { git = "https://github.com/servo/stylo", branch = "2023-10-16", features = ["servo"] } +style = { git = "https://github.com/servo/stylo", branch = "2023-12-01", features = ["servo"] } +style_config = { git = "https://github.com/servo/stylo", branch = "2023-12-01" } +style_traits = { git = "https://github.com/servo/stylo", branch = "2023-12-01", features = ["servo"] } # NOTE: the sm-angle feature only enables ANGLE on Windows, not other platforms! surfman = { version = "0.9", features = ["chains", "sm-angle", "sm-angle-default"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } synstructure = "0.13" thin-vec = "0.2.13" time = "0.1.41" -to_shmem = { git = "https://github.com/servo/stylo", branch = "2023-10-16" } +to_shmem = { git = "https://github.com/servo/stylo", branch = "2023-12-01" } tokio = "1" tokio-rustls = "0.24" tungstenite = "0.20" diff --git a/components/layout/block.rs b/components/layout/block.rs index b0bd785ac3a..1aa32668e89 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -1673,6 +1673,7 @@ impl BlockFlow { .style() .get_inherited_text() .text_indent + .length .to_used_value(containing_block_size); } } diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs index 76dc2fea701..2bd7c5697f3 100644 --- a/components/layout_2020/flow/inline.rs +++ b/components/layout_2020/flow/inline.rs @@ -1587,6 +1587,7 @@ impl InlineFormattingContext { .style .get_inherited_text() .text_indent + .length .to_used_value(containing_block.inline_size) .into() } else { diff --git a/tests/unit/style/custom_properties.rs b/tests/unit/style/custom_properties.rs index 1cf0b62c028..cd67398cdda 100644 --- a/tests/unit/style/custom_properties.rs +++ b/tests/unit/style/custom_properties.rs @@ -12,13 +12,17 @@ use style::custom_properties::{ use style::font_metrics::FontMetrics; use style::media_queries::{Device, MediaType}; use style::properties::style_structs::Font; -use style::properties::{CustomDeclaration, CustomDeclarationValue}; +use style::properties::{CustomDeclaration, CustomDeclarationValue, StyleBuilder}; +use style::rule_cache::RuleCacheConditions; use style::rule_tree::CascadeLevel; use style::servo::media_queries::FontMetricsProvider; +use style::stylesheets::container_rule::ContainerSizeQuery; use style::stylesheets::layer_rule::LayerOrder; +use style::stylesheets::UrlExtraData; use style::stylist::Stylist; -use style::values::computed::Length; +use style::values::computed::{Context, Length}; use test::{self, Bencher}; +use url::Url; #[derive(Debug)] struct DummyMetricsProvider; @@ -40,13 +44,16 @@ fn cascade( name_and_value: &[(&str, &str)], inherited: &ComputedCustomProperties, ) -> ComputedCustomProperties { + let dummy_url_data = UrlExtraData::from(Url::parse("about:blank").unwrap()); let declarations = name_and_value .iter() .map(|&(name, value)| { let mut input = ParserInput::new(value); let mut parser = Parser::new(&mut input); let name = Name::from(name); - let value = CustomDeclarationValue::Value(SpecifiedValue::parse(&mut parser).unwrap()); + let value = CustomDeclarationValue::Value( + SpecifiedValue::parse(&mut parser, &dummy_url_data).unwrap(), + ); CustomDeclaration { name, value } }) .collect::>(); @@ -59,7 +66,16 @@ fn cascade( Box::new(DummyMetricsProvider), ); let stylist = Stylist::new(device, QuirksMode::NoQuirks); - let mut builder = CustomPropertiesBuilder::new(inherited, &stylist, false); + let mut builder = StyleBuilder::new(stylist.device(), Some(&stylist), None, None, None, false); + builder.custom_properties = inherited.clone(); + let mut rule_cache_conditions = RuleCacheConditions::default(); + let context = Context::new( + builder, + stylist.quirks_mode(), + &mut rule_cache_conditions, + ContainerSizeQuery::none(), + ); + let mut builder = CustomPropertiesBuilder::new(&stylist, &context); for declaration in &declarations { builder.cascade( diff --git a/tests/unit/style/stylist.rs b/tests/unit/style/stylist.rs index a6be5c5fe77..2be0ccd9cfb 100644 --- a/tests/unit/style/stylist.rs +++ b/tests/unit/style/stylist.rs @@ -67,7 +67,7 @@ fn get_mock_rules(css_selectors: &[&str]) -> (Vec>, SharedRwLock) { let guard = shared_lock.read(); let rule = locked.read_with(&guard); rule.selectors - .0 + .slice() .iter() .map(|s| { Rule::new( @@ -93,10 +93,11 @@ fn parse_selectors(selectors: &[&str]) -> Vec> { .map(|x| { SelectorParser::parse_author_origin_no_namespace(x, &dummy_url_data) .unwrap() - .0 + .slice() .into_iter() .next() .unwrap() + .clone() }) .collect() } diff --git a/tests/wpt/meta-legacy-layout/css/css-color/nested-color-mix-with-currentcolor.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/nested-color-mix-with-currentcolor.html.ini deleted file mode 100644 index e5707a250b3..00000000000 --- a/tests/wpt/meta-legacy-layout/css/css-color/nested-color-mix-with-currentcolor.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[nested-color-mix-with-currentcolor.html] - [Nested color-mix function with inner currentColor should inherit unresolved] - expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-color-mix-function.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-color-mix-function.html.ini index e4934000354..0426b4afca9 100644 --- a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-color-mix-function.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-color-mix-function.html.ini @@ -17,9 +17,6 @@ [Property color value 'color-mix(in hsl specified hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))'] expected: FAIL - [Property color value 'color-mix(in hsl, hsl(120deg 40% 40% / none), hsl(0deg 40% 40% / none))'] - expected: FAIL - [Property color value 'color-mix(in hsl, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)'] expected: FAIL @@ -65,9 +62,6 @@ [Property color value 'color-mix(in hwb specified hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))'] expected: FAIL - [Property color value 'color-mix(in hwb, hwb(120deg 10% 20% / none), hwb(30deg 30% 40% / none))'] - expected: FAIL - [Property color value 'color-mix(in hwb, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)'] expected: FAIL @@ -377,12 +371,6 @@ [Property color value 'color-mix(in oklab, oklab(10 20 30 / none), oklab(50 60 70 / none))'] expected: FAIL - [Property color value 'color-mix(in lch, transparent, lch(0.3 0.4 30deg))'] - expected: FAIL - - [Property color value 'color-mix(in lch, transparent 10%, lch(0.3 0.4 30deg))'] - expected: FAIL - [Property color value 'color-mix(in oklch, transparent, oklch(30 40 30deg))'] expected: FAIL @@ -395,29 +383,8 @@ [Property color value 'color-mix(in oklch, oklch(10 20 120deg / 0) 10%, oklch(30 40 30deg))'] expected: FAIL - [Property color value 'color-mix(in oklch, transparent, oklch(0.3 40 30deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, transparent 10%, oklch(0.3 40 30deg))'] - expected: FAIL - - [Property color value 'color-mix(in hsl longer hue, hsl(60deg 50% 50%), hsl(60deg 50% 50%))'] - expected: FAIL - - [Property color value 'color-mix(in lch, lab(50 0 0), black)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklab(0.5 0 0), black)'] - expected: FAIL - [Property color value 'color-mix(in lch, white, blue)'] expected: FAIL [Property color value 'color-mix(in lch, white 10%, blue)'] expected: FAIL - - [Property color value 'color-mix(in oklch, white, blue)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, white 10%, blue)'] - expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hsl.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hsl.html.ini index 8e6a7b1206d..649c75aa7c9 100644 --- a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hsl.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hsl.html.ini @@ -10,45 +10,3 @@ [e.style['color'\] = "hsl(90 50% 50% / calc(-infinity))" should set the property value] expected: FAIL - - [e.style['color'\] = "hsl(120 30 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30% 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30% 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 50%)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 50% / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 none 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 none 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 none)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 none / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 50 / none)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(30 -50% 60)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(0 -50 40%)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(30 -50 60)" should set the property value] - expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hwb.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hwb.html.ini index c550df2b8d2..7bf93908cb4 100644 --- a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hwb.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hwb.html.ini @@ -10,36 +10,3 @@ [e.style['color'\] = "hwb(90 20% 10% / calc(-infinity))" should set the property value] expected: FAIL - - [e.style['color'\] = "hwb(120 30 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30% 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30% 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 50%)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 50% / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 none 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 none 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 none)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 none / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 50 / none)" should set the property value] - expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-logical/animation-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-logical/animation-002.html.ini index 1041a80e4bd..f1fe1505d96 100644 --- a/tests/wpt/meta-legacy-layout/css/css-logical/animation-002.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-logical/animation-002.html.ini @@ -1,2 +1,24 @@ [animation-002.html] - expected: CRASH + [Logical properties in animations respect the writing-mode] + expected: FAIL + + [Logical properties are able to override physical properties in @keyframes declaration blocks] + expected: FAIL + + [Declaration order is respected amongst logical properties within @keyframes declaration blocks] + expected: FAIL + + [Animations update when the writing-mode is changed] + expected: FAIL + + [Filling animations update when the writing-mode is changed] + expected: FAIL + + [The number of interpolating properties can be increased when the writing-mode is changed] + expected: FAIL + + [The number of interpolating properties can be decreased when the writing-mode is changed] + expected: FAIL + + [Animations update when the writing-mode is changed through a CSS variable] + expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-values/viewport-units-extreme-scale.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/viewport-units-extreme-scale.html.ini deleted file mode 100644 index 3f6db0ae61a..00000000000 --- a/tests/wpt/meta-legacy-layout/css/css-values/viewport-units-extreme-scale.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[viewport-units-extreme-scale.html] - [calc((1vw - 6.3999px) * 10000000) computes to 1000px] - expected: FAIL - - [calc((100vh - 479px) * 60000) computes to 60000px] - expected: FAIL diff --git a/tests/wpt/meta/css/css-color/nested-color-mix-with-currentcolor.html.ini b/tests/wpt/meta/css/css-color/nested-color-mix-with-currentcolor.html.ini deleted file mode 100644 index e5707a250b3..00000000000 --- a/tests/wpt/meta/css/css-color/nested-color-mix-with-currentcolor.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[nested-color-mix-with-currentcolor.html] - [Nested color-mix function with inner currentColor should inherit unresolved] - expected: FAIL diff --git a/tests/wpt/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini b/tests/wpt/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini index e4934000354..0426b4afca9 100644 --- a/tests/wpt/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini +++ b/tests/wpt/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini @@ -17,9 +17,6 @@ [Property color value 'color-mix(in hsl specified hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))'] expected: FAIL - [Property color value 'color-mix(in hsl, hsl(120deg 40% 40% / none), hsl(0deg 40% 40% / none))'] - expected: FAIL - [Property color value 'color-mix(in hsl, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)'] expected: FAIL @@ -65,9 +62,6 @@ [Property color value 'color-mix(in hwb specified hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))'] expected: FAIL - [Property color value 'color-mix(in hwb, hwb(120deg 10% 20% / none), hwb(30deg 30% 40% / none))'] - expected: FAIL - [Property color value 'color-mix(in hwb, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)'] expected: FAIL @@ -377,12 +371,6 @@ [Property color value 'color-mix(in oklab, oklab(10 20 30 / none), oklab(50 60 70 / none))'] expected: FAIL - [Property color value 'color-mix(in lch, transparent, lch(0.3 0.4 30deg))'] - expected: FAIL - - [Property color value 'color-mix(in lch, transparent 10%, lch(0.3 0.4 30deg))'] - expected: FAIL - [Property color value 'color-mix(in oklch, transparent, oklch(30 40 30deg))'] expected: FAIL @@ -395,29 +383,8 @@ [Property color value 'color-mix(in oklch, oklch(10 20 120deg / 0) 10%, oklch(30 40 30deg))'] expected: FAIL - [Property color value 'color-mix(in oklch, transparent, oklch(0.3 40 30deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, transparent 10%, oklch(0.3 40 30deg))'] - expected: FAIL - - [Property color value 'color-mix(in hsl longer hue, hsl(60deg 50% 50%), hsl(60deg 50% 50%))'] - expected: FAIL - - [Property color value 'color-mix(in lch, lab(50 0 0), black)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklab(0.5 0 0), black)'] - expected: FAIL - [Property color value 'color-mix(in lch, white, blue)'] expected: FAIL [Property color value 'color-mix(in lch, white 10%, blue)'] expected: FAIL - - [Property color value 'color-mix(in oklch, white, blue)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, white 10%, blue)'] - expected: FAIL diff --git a/tests/wpt/meta/css/css-color/parsing/color-valid-hsl.html.ini b/tests/wpt/meta/css/css-color/parsing/color-valid-hsl.html.ini index 8e6a7b1206d..649c75aa7c9 100644 --- a/tests/wpt/meta/css/css-color/parsing/color-valid-hsl.html.ini +++ b/tests/wpt/meta/css/css-color/parsing/color-valid-hsl.html.ini @@ -10,45 +10,3 @@ [e.style['color'\] = "hsl(90 50% 50% / calc(-infinity))" should set the property value] expected: FAIL - - [e.style['color'\] = "hsl(120 30 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30% 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30% 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 50%)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 50% / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 none 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 none 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 none)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 none / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(120 30 50 / none)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(30 -50% 60)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(0 -50 40%)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hsl(30 -50 60)" should set the property value] - expected: FAIL diff --git a/tests/wpt/meta/css/css-color/parsing/color-valid-hwb.html.ini b/tests/wpt/meta/css/css-color/parsing/color-valid-hwb.html.ini index c550df2b8d2..7bf93908cb4 100644 --- a/tests/wpt/meta/css/css-color/parsing/color-valid-hwb.html.ini +++ b/tests/wpt/meta/css/css-color/parsing/color-valid-hwb.html.ini @@ -10,36 +10,3 @@ [e.style['color'\] = "hwb(90 20% 10% / calc(-infinity))" should set the property value] expected: FAIL - - [e.style['color'\] = "hwb(120 30 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30% 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30% 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 50%)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 50% / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 none 50)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 none 50 / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 none)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 none / 0.5)" should set the property value] - expected: FAIL - - [e.style['color'\] = "hwb(120 30 50 / none)" should set the property value] - expected: FAIL diff --git a/tests/wpt/meta/css/css-logical/animation-002.html.ini b/tests/wpt/meta/css/css-logical/animation-002.html.ini index 50e3dcca9d1..98fe271e699 100644 --- a/tests/wpt/meta/css/css-logical/animation-002.html.ini +++ b/tests/wpt/meta/css/css-logical/animation-002.html.ini @@ -1,7 +1,5 @@ [animation-002.html] - expected: CRASH bug: https://github.com/servo/servo/issues/29891 - [Logical properties in animations respect the writing-mode] expected: FAIL @@ -29,8 +27,5 @@ [Animations update when the writing-mode is changed through a CSS variable] expected: FAIL - [Logical shorthand with variable references animates correctly] - expected: FAIL - [Animations update when the direction is changed] expected: FAIL