diff --git a/Cargo.lock b/Cargo.lock index 68880610286..68cfd471dd3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1687,7 +1687,7 @@ dependencies = [ [[package]] name = "dom" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "bitflags 2.9.0", "malloc_size_of", @@ -4486,7 +4486,7 @@ dependencies = [ [[package]] name = "malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "app_units", "cssparser", @@ -6491,7 +6491,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.26.0" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "bitflags 2.9.0", "cssparser", @@ -6776,7 +6776,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.0" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "serde", "stable_deref_trait", @@ -6785,7 +6785,7 @@ dependencies = [ [[package]] name = "servo_atoms" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "string_cache", "string_cache_codegen", @@ -7143,7 +7143,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "static_prefs" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" [[package]] name = "strck" @@ -7223,7 +7223,7 @@ dependencies = [ [[package]] name = "style" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "app_units", "arrayvec", @@ -7281,7 +7281,7 @@ dependencies = [ [[package]] name = "style_config" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "lazy_static", ] @@ -7289,7 +7289,7 @@ dependencies = [ [[package]] name = "style_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "darling", "proc-macro2", @@ -7319,7 +7319,7 @@ dependencies = [ [[package]] name = "style_traits" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "app_units", "bitflags 2.9.0", @@ -7703,7 +7703,7 @@ dependencies = [ [[package]] name = "to_shmem" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "cssparser", "servo_arc", @@ -7716,7 +7716,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-02-03#8c57436148122c32b3cc3d40ee7c71806af1d087" +source = "git+https://github.com/servo/stylo?branch=2025-03-01#0190fff684fa7b67f5413a60f215e671b6222534" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index da304030744..e982e2c3515 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,25 +117,25 @@ rustls-pemfile = "2.0" rustls-pki-types = "1.11" script_layout_interface = { path = "components/shared/script_layout" } script_traits = { path = "components/shared/script" } -selectors = { git = "https://github.com/servo/stylo", branch = "2025-02-03" } +selectors = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } serde = "1.0.218" 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 = "2025-02-03", features = ["servo"] } -servo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-02-03" } +servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] } +servo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } smallbitvec = "2.6.0" smallvec = "1.14" static_assertions = "1.1" string_cache = "0.8" string_cache_codegen = "0.5" -style = { git = "https://github.com/servo/stylo", branch = "2025-02-03", features = ["servo"] } -style_config = { git = "https://github.com/servo/stylo", branch = "2025-02-03" } -style_dom = { git = "https://github.com/servo/stylo", package = "dom", branch = "2025-02-03" } -style_malloc_size_of = { package = "malloc_size_of", git = "https://github.com/servo/stylo", branch = "2025-02-03", features = ["servo"] } -style_traits = { git = "https://github.com/servo/stylo", branch = "2025-02-03", features = ["servo"] } +style = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] } +style_config = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } +style_dom = { git = "https://github.com/servo/stylo", package = "dom", branch = "2025-03-01" } +style_malloc_size_of = { package = "malloc_size_of", git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] } +style_traits = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] } surfman = { git = "https://github.com/servo/surfman", rev = "f7688b4585f9e0b5d4bf8ee8e4a91e82349610b1", features = ["chains"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } synstructure = "0.13" @@ -144,7 +144,7 @@ thin-vec = "0.2.13" tikv-jemalloc-sys = "0.6.0" tikv-jemallocator = "0.6.0" time = { package = "time", version = "0.3", features = ["large-dates", "local-offset", "serde"] } -to_shmem = { git = "https://github.com/servo/stylo", branch = "2025-02-03" } +to_shmem = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } tokio = "1" tokio-rustls = { version = "0.26", default-features = false, features = ["logging"] } tower-service = "0.3" diff --git a/components/fonts/font_template.rs b/components/fonts/font_template.rs index fa81e3206ff..eca1017d14e 100644 --- a/components/fonts/font_template.rs +++ b/components/fonts/font_template.rs @@ -115,7 +115,6 @@ impl FontTemplateDescriptor { } self.style = match css_font_template_descriptors.style { Some(ComputedFontStyleDescriptor::Italic) => (FontStyle::ITALIC, FontStyle::ITALIC), - Some(ComputedFontStyleDescriptor::Normal) => (FontStyle::NORMAL, FontStyle::NORMAL), Some(ComputedFontStyleDescriptor::Oblique(angle_1, angle_2)) => ( FontStyle::oblique(angle_1.to_float()), FontStyle::oblique(angle_2.to_float()), diff --git a/components/fonts/system_font_service.rs b/components/fonts/system_font_service.rs index 6cbd5390122..61b36e699df 100644 --- a/components/fonts/system_font_service.rs +++ b/components/fonts/system_font_service.rs @@ -359,7 +359,6 @@ pub struct SystemFontServiceProxy { /// because the specified version of `FontStyle` contains floats. #[derive(Clone, Debug, Deserialize, Serialize)] pub enum ComputedFontStyleDescriptor { - Normal, Italic, Oblique(FontStyleFixedPoint, FontStyleFixedPoint), } @@ -416,7 +415,6 @@ impl From<&FontFaceRuleData> for CSSFontFaceDescriptors { fn style_to_computed(specified: &FontFaceStyle) -> ComputedFontStyleDescriptor { match specified { - FontFaceStyle::Normal => ComputedFontStyleDescriptor::Normal, FontFaceStyle::Italic => ComputedFontStyleDescriptor::Italic, FontFaceStyle::Oblique(angle_a, angle_b) => ComputedFontStyleDescriptor::Oblique( FixedPoint::from_float(angle_a.degrees()), 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 a617f80c81b..70794e725e4 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 @@ -1,423 +1,3 @@ [color-computed-color-mix-function.html] - [Property color value 'color-mix(in hsl specified hue, hsl(40deg 50% 50%), hsl(60deg 50% 50%))'] - expected: FAIL - - [Property color value 'color-mix(in hsl specified hue, hsl(60deg 50% 50%), hsl(40deg 50% 50%))'] - expected: FAIL - - [Property color value 'color-mix(in hsl specified hue, hsl(50deg 50% 50%), hsl(330deg 50% 50%))'] - expected: FAIL - - [Property color value 'color-mix(in hsl specified hue, hsl(330deg 50% 50%), hsl(50deg 50% 50%))'] - expected: FAIL - - [Property color value 'color-mix(in hsl specified hue, hsl(20deg 50% 50%), hsl(320deg 50% 50%))'] - expected: FAIL - - [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, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hsl, lab(100 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hsl, lab(0 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hsl, lch(100 116 334) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hsl, lch(0 116 334) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hsl, oklab(100 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hsl, oklab(0 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hsl, oklch(100 0.399 336.3) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hsl, oklch(0 0.399 336.3) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hwb specified hue, hwb(40deg 30% 40%), hwb(60deg 30% 40%))'] - expected: FAIL - - [Property color value 'color-mix(in hwb specified hue, hwb(60deg 30% 40%), hwb(40deg 30% 40%))'] - expected: FAIL - - [Property color value 'color-mix(in hwb specified hue, hwb(50deg 30% 40%), hwb(330deg 30% 40%))'] - expected: FAIL - - [Property color value 'color-mix(in hwb specified hue, hwb(330deg 30% 40%), hwb(50deg 30% 40%))'] - expected: FAIL - - [Property color value 'color-mix(in hwb specified hue, hwb(20deg 30% 40%), hwb(320deg 30% 40%))'] - expected: FAIL - - [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, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hwb, lab(100 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hwb, lab(0 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hwb, lch(100 116 334) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hwb, lch(0 116 334) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hwb, oklab(100 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hwb, oklab(0 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hwb, oklch(100 0.399 336.3) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in hwb, oklch(0 0.399 336.3) 100%, rgb(0, 0, 0) 0%)'] - expected: FAIL - - [Property color value 'color-mix(in lch specified hue, lch(100 0 40deg), lch(100 0 60deg))'] - expected: FAIL - - [Property color value 'color-mix(in lch specified hue, lch(100 0 60deg), lch(100 0 40deg))'] - expected: FAIL - - [Property color value 'color-mix(in lch specified hue, lch(100 0 50deg), lch(100 0 330deg))'] - expected: FAIL - - [Property color value 'color-mix(in lch specified hue, lch(100 0 330deg), lch(100 0 50deg))'] - expected: FAIL - - [Property color value 'color-mix(in lch specified hue, lch(100 0 20deg), lch(100 0 320deg))'] - expected: FAIL - - [Property color value 'color-mix(in lch specified hue, lch(100 0 320deg), lch(100 0 20deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg), oklch(50 60 70deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg) 25%, oklch(50 60 70deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, 25% oklch(10 20 30deg), oklch(50 60 70deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg), 25% oklch(50 60 70deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg), oklch(50 60 70deg) 25%)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg) 25%, oklch(50 60 70deg) 75%)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg) 30%, oklch(50 60 70deg) 90%)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg) 12.5%, oklch(50 60 70deg) 37.5%)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg) 0%, oklch(50 60 70deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / .4), oklch(50 60 70deg / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / .4) 25%, oklch(50 60 70deg / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, 25% oklch(10 20 30deg / .4), oklch(50 60 70deg / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / .4), 25% oklch(50 60 70deg / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / .4), oklch(50 60 70deg / .8) 25%)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / .4) 25%, oklch(50 60 70deg / .8) 75%)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / .4) 30%, oklch(50 60 70deg / .8) 90%)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / .4) 12.5%, oklch(50 60 70deg / .8) 37.5%)'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / .4) 0%, oklch(50 60 70deg / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(100 0 40deg), oklch(100 0 60deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(100 0 60deg), oklch(100 0 40deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(100 0 50deg), oklch(100 0 330deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(100 0 330deg), oklch(100 0 50deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(100 0 20deg), oklch(100 0 320deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(100 0 320deg), oklch(100 0 20deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch shorter hue, oklch(100 0 40deg), oklch(100 0 60deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch shorter hue, oklch(100 0 60deg), oklch(100 0 40deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch shorter hue, oklch(100 0 50deg), oklch(100 0 330deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch shorter hue, oklch(100 0 330deg), oklch(100 0 50deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch shorter hue, oklch(100 0 20deg), oklch(100 0 320deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch shorter hue, oklch(100 0 320deg), oklch(100 0 20deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch longer hue, oklch(100 0 40deg), oklch(100 0 60deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch longer hue, oklch(100 0 60deg), oklch(100 0 40deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch longer hue, oklch(100 0 50deg), oklch(100 0 330deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch longer hue, oklch(100 0 330deg), oklch(100 0 50deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch longer hue, oklch(100 0 20deg), oklch(100 0 320deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch longer hue, oklch(100 0 320deg), oklch(100 0 20deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch increasing hue, oklch(100 0 40deg), oklch(100 0 60deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch increasing hue, oklch(100 0 60deg), oklch(100 0 40deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch increasing hue, oklch(100 0 50deg), oklch(100 0 330deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch increasing hue, oklch(100 0 330deg), oklch(100 0 50deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch increasing hue, oklch(100 0 20deg), oklch(100 0 320deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch increasing hue, oklch(100 0 320deg), oklch(100 0 20deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch decreasing hue, oklch(100 0 40deg), oklch(100 0 60deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch decreasing hue, oklch(100 0 60deg), oklch(100 0 40deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch decreasing hue, oklch(100 0 50deg), oklch(100 0 330deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch decreasing hue, oklch(100 0 330deg), oklch(100 0 50deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch decreasing hue, oklch(100 0 20deg), oklch(100 0 320deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch decreasing hue, oklch(100 0 320deg), oklch(100 0 20deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch specified hue, oklch(100 0 40deg), oklch(100 0 60deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch specified hue, oklch(100 0 60deg), oklch(100 0 40deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch specified hue, oklch(100 0 50deg), oklch(100 0 330deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch specified hue, oklch(100 0 330deg), oklch(100 0 50deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch specified hue, oklch(100 0 20deg), oklch(100 0 320deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch specified hue, oklch(100 0 320deg), oklch(100 0 20deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(none none none), oklch(50 60 70deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg), oklch(none none none))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 none), oklch(50 60 70deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg), oklch(50 60 none))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(none 20 30deg), oklch(50 none 70deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / none), oklch(50 60 70deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / none), oklch(50 60 70deg / 0.5))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 30deg / none), oklch(50 60 70deg / none))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30), oklab(50 60 70))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30) 25%, oklab(50 60 70))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, 25% oklab(10 20 30), oklab(50 60 70))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30), 25% oklab(50 60 70))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30), oklab(50 60 70) 25%)'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30) 25%, oklab(50 60 70) 75%)'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30) 30%, oklab(50 60 70) 90%)'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30) 12.5%, oklab(50 60 70) 37.5%)'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30) 0%, oklab(50 60 70))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / .4), oklab(50 60 70 / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / .4) 25%, oklab(50 60 70 / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, 25% oklab(10 20 30 / .4), oklab(50 60 70 / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / .4), 25% oklab(50 60 70 / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / .4), oklab(50 60 70 / .8) 25%)'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / .4) 25%, oklab(50 60 70 / .8) 75%)'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / .4) 30%, oklab(50 60 70 / .8) 90%)'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / .4) 12.5%, oklab(50 60 70 / .8) 37.5%)'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / .4) 0%, oklab(50 60 70 / .8))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(none none none), oklab(50 60 70))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30), oklab(none none none))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 none), oklab(50 60 70))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30), oklab(50 60 none))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(none 20 30), oklab(50 none 70))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / none), oklab(50 60 70))'] - expected: FAIL - - [Property color value 'color-mix(in oklab, oklab(10 20 30 / none), oklab(50 60 70 / 0.5))'] - expected: FAIL - - [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 oklch, transparent, oklch(30 40 30deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, transparent 10%, oklch(30 40 30deg))'] - expected: FAIL - - [Property color value 'color-mix(in oklch, oklch(10 20 120deg / 0), oklch(30 40 30deg))'] - expected: FAIL - - [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 srgb, red calc(50% + (sign(100em - 1px) * 10%)), blue)'] expected: FAIL - - [Property color value 'color-mix(in hsl longer hue, red, white)'] - expected: FAIL - - [Property color value 'color-mix(in hsl longer hue, red, black)'] - expected: FAIL - - [Property color value 'color-mix(in hsl longer hue, red, transparent)'] - expected: FAIL - - [Property color value 'color-mix(in hwb longer hue, red, white)'] - expected: FAIL - - [Property color value 'color-mix(in hwb longer hue, red, black)'] - expected: FAIL - - [Property color value 'color-mix(in hwb longer hue, red, transparent)'] - expected: FAIL - - [Property color value 'color-mix(in lch longer hue, red, white)'] - expected: FAIL - - [Property color value 'color-mix(in lch longer hue, red, black)'] - expected: FAIL - - [Property color value 'color-mix(in lch longer hue, red, transparent)'] - expected: FAIL - - [Property color value 'color-mix(in oklch longer hue, red, white)'] - expected: FAIL - - [Property color value 'color-mix(in oklch longer hue, red, black)'] - expected: FAIL - - [Property color value 'color-mix(in oklch longer hue, red, transparent)'] - expected: FAIL diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-style-computed.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-style-computed.html.ini index aa41e6afaf0..161a55b8912 100644 --- a/tests/wpt/meta/css/css-fonts/parsing/font-style-computed.html.ini +++ b/tests/wpt/meta/css/css-fonts/parsing/font-style-computed.html.ini @@ -1,9 +1,3 @@ [font-style-computed.html] [Property font-style value 'oblique calc(30deg + (sign(20cqw - 10px) * 5deg))'] expected: FAIL - - [Property font-style value 'oblique 0deg'] - expected: FAIL - - [Property font-style value 'oblique calc(10deg - 10deg)'] - expected: FAIL diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-style-valid.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-style-valid.html.ini index b32792844d8..30877373762 100644 --- a/tests/wpt/meta/css/css-fonts/parsing/font-style-valid.html.ini +++ b/tests/wpt/meta/css/css-fonts/parsing/font-style-valid.html.ini @@ -1,6 +1,3 @@ [font-style-valid.html] [e.style['font-style'\] = "oblique calc(30deg + (sign(2cqw - 10px) * 5deg))" should set the property value] expected: FAIL - - [e.style['font-style'\] = "oblique 0deg" should set the property value] - expected: FAIL diff --git a/tests/wpt/meta/css/css-fonts/variations/font-style-parsing.html.ini b/tests/wpt/meta/css/css-fonts/variations/font-style-parsing.html.ini deleted file mode 100644 index 2fc8c29558a..00000000000 --- a/tests/wpt/meta/css/css-fonts/variations/font-style-parsing.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[font-style-parsing.html] - [Font-style (computed): 'oblique' followed by zero degrees is valid] - expected: FAIL