diff --git a/Cargo.lock b/Cargo.lock index 0f5c5e5347f..7d2d4d30284 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1598,6 +1598,26 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "devtools" version = "0.0.1" @@ -6787,12 +6807,12 @@ dependencies = [ [[package]] name = "selectors" -version = "0.28.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +version = "0.29.0" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "bitflags 2.9.1", "cssparser", - "derive_more", + "derive_more 2.0.1", "fxhash", "log", "new_debug_unreachable", @@ -7083,7 +7103,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.1" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "serde", "stable_deref_trait", @@ -7547,8 +7567,8 @@ dependencies = [ [[package]] name = "stylo" -version = "0.3.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +version = "0.4.0" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "app_units", "arrayvec", @@ -7556,7 +7576,7 @@ dependencies = [ "bitflags 2.9.1", "byteorder", "cssparser", - "derive_more", + "derive_more 2.0.1", "encoding_rs", "euclid", "fxhash", @@ -7604,8 +7624,8 @@ dependencies = [ [[package]] name = "stylo_atoms" -version = "0.3.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +version = "0.4.0" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "string_cache", "string_cache_codegen", @@ -7613,13 +7633,13 @@ dependencies = [ [[package]] name = "stylo_config" -version = "0.3.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +version = "0.4.0" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" [[package]] name = "stylo_derive" -version = "0.3.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +version = "0.4.0" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "darling", "proc-macro2", @@ -7630,8 +7650,8 @@ dependencies = [ [[package]] name = "stylo_dom" -version = "0.3.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +version = "0.4.0" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "bitflags 2.9.1", "stylo_malloc_size_of", @@ -7639,8 +7659,8 @@ dependencies = [ [[package]] name = "stylo_malloc_size_of" -version = "0.3.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +version = "0.4.0" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "app_units", "cssparser", @@ -7656,13 +7676,13 @@ dependencies = [ [[package]] name = "stylo_static_prefs" -version = "0.3.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +version = "0.4.0" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" [[package]] name = "stylo_traits" -version = "0.3.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +version = "0.4.0" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "app_units", "bitflags 2.9.1", @@ -8079,7 +8099,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.2.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "cssparser", "servo_arc", @@ -8092,7 +8112,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-05-01#3a3663a3199282cb06889e48a427db76f320ddc3" +source = "git+https://github.com/servo/stylo?branch=2025-06-03#2e1f66b06836428e4b29dd8144c72432c97ff316" dependencies = [ "darling", "proc-macro2", @@ -9038,7 +9058,7 @@ dependencies = [ "bitflags 2.9.1", "build-parallel", "byteorder", - "derive_more", + "derive_more 0.99.20", "etagere", "euclid", "fxhash", diff --git a/Cargo.toml b/Cargo.toml index 2f034745fb5..edfce3d48be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,7 +120,7 @@ rustls-pemfile = "2.0" rustls-pki-types = "1.12" script_layout_interface = { path = "components/shared/script_layout" } script_traits = { path = "components/shared/script" } -selectors = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } +selectors = { git = "https://github.com/servo/stylo", branch = "2025-06-03" } serde = "1.0.219" serde_bytes = "0.11" serde_json = "1.0" @@ -128,7 +128,7 @@ 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-tracing = { path = "components/servo_tracing" } -servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } +servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-06-03" } smallbitvec = "2.6.0" smallvec = "1.15" snapshot = { path = "./components/shared/snapshot" } @@ -137,12 +137,12 @@ string_cache = "0.8" string_cache_codegen = "0.5" strum = "0.26" strum_macros = "0.26" -stylo = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } -stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } -stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } -stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } -stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } -stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } +stylo = { git = "https://github.com/servo/stylo", branch = "2025-06-03" } +stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-06-03" } +stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-06-03" } +stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-06-03" } +stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-06-03" } +stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-06-03" } 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" diff --git a/components/layout/context.rs b/components/layout/context.rs index 1ee76606b0b..5360c24ae9f 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -311,6 +311,7 @@ impl LayoutContext<'_> { }) }) }, + Image::LightDark(..) => unreachable!("light-dark() should be disabled"), } } } diff --git a/components/layout/lists.rs b/components/layout/lists.rs index 8c653cb6858..730735b86e1 100644 --- a/components/layout/lists.rs +++ b/components/layout/lists.rs @@ -35,6 +35,7 @@ pub(crate) fn make_marker<'dom>( Image::CrossFade(..) | Image::PaintWorklet(..) | Image::None => None, + Image::LightDark(..) => unreachable!("light-dark() should be disabled"), }; let content = marker_image().or_else(|| { Some(vec![PseudoElementContentItem::Text( diff --git a/deny.toml b/deny.toml index 037e09e8469..123a14d9a7d 100644 --- a/deny.toml +++ b/deny.toml @@ -171,6 +171,9 @@ skip = [ "rand_core", "wasi", "webpki-roots", + + # Stylo uses 2.0, WebRender uses 0.99 + "derive_more", ] # github.com organizations to allow git sources for diff --git a/tests/wpt/meta/css/css-color/light-dark-currentcolor-in-color.html.ini b/tests/wpt/meta/css/css-color/light-dark-currentcolor-in-color.html.ini new file mode 100644 index 00000000000..abecbdd3ba8 --- /dev/null +++ b/tests/wpt/meta/css/css-color/light-dark-currentcolor-in-color.html.ini @@ -0,0 +1,3 @@ +[light-dark-currentcolor-in-color.html] + [curentColor in light-dark() refers to parent color] + expected: FAIL diff --git a/tests/wpt/meta/css/css-color/light-dark-currentcolor.html.ini b/tests/wpt/meta/css/css-color/light-dark-currentcolor.html.ini deleted file mode 100644 index 669af6d8ea5..00000000000 --- a/tests/wpt/meta/css/css-color/light-dark-currentcolor.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[light-dark-currentcolor.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-color/light-dark-inheritance.html.ini b/tests/wpt/meta/css/css-color/light-dark-inheritance.html.ini deleted file mode 100644 index bf8493daf3a..00000000000 --- a/tests/wpt/meta/css/css-color/light-dark-inheritance.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[light-dark-inheritance.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini b/tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini index 9a7822335e1..02097868834 100644 --- a/tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini +++ b/tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini @@ -497,11 +497,5 @@ [Property color value 'color(from hwb(from color(xyz-d65 0.99 0.88 0.77) h w b) xyz-d65 x y z)'] expected: FAIL - [Property color value 'light-dark(rgb(from rebeccapurple r g b), rgb(from rebeccapurple r g b))'] - expected: FAIL - - [Property color value 'light-dark(color-mix(in srgb, rgb(from rebeccapurple none g b), rebeccapurple), color-mix(in srgb, rgb(from rebeccapurple none g b), rebeccapurple))'] - expected: FAIL - [Property color value 'LCH(from var(--accent) l c calc(h + 180 * sibling-index()))'] expected: FAIL diff --git a/tests/wpt/meta/css/css-easing/timing-functions-syntax-valid.html.ini b/tests/wpt/meta/css/css-easing/timing-functions-syntax-valid.html.ini index 4620f3f5070..46064a3d393 100644 --- a/tests/wpt/meta/css/css-easing/timing-functions-syntax-valid.html.ini +++ b/tests/wpt/meta/css/css-easing/timing-functions-syntax-valid.html.ini @@ -20,9 +20,6 @@ [e.style['animation-timing-function'\] = "steps(calc(-10), start)" should set the property value] expected: FAIL - [e.style['animation-timing-function'\] = "steps(calc(5 / 2), start)" should set the property value] - expected: FAIL - [e.style['animation-timing-function'\] = "steps(calc(1), jump-none)" should set the property value] expected: FAIL diff --git a/tests/wpt/meta/css/css-nesting/nested-declarations-cssom-whitespace.html.ini b/tests/wpt/meta/css/css-nesting/nested-declarations-cssom-whitespace.html.ini deleted file mode 100644 index 49fac78706d..00000000000 --- a/tests/wpt/meta/css/css-nesting/nested-declarations-cssom-whitespace.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[nested-declarations-cssom-whitespace.html] - [Empty CSSNestedDeclarations do not affect outer serialization] - expected: FAIL - - [Empty CSSNestedDeclarations do not affect outer serialization (nested grouping rule)] - expected: FAIL diff --git a/tests/wpt/meta/css/css-values/attr-all-types.html.ini b/tests/wpt/meta/css/css-values/attr-all-types.html.ini index 769d98fcfc1..0b39fc70aac 100644 --- a/tests/wpt/meta/css/css-values/attr-all-types.html.ini +++ b/tests/wpt/meta/css/css-values/attr-all-types.html.ini @@ -41,6 +41,9 @@ [CSS Values and Units Test: attr 17] expected: FAIL + [CSS Values and Units Test: attr 20] + expected: FAIL + [CSS Values and Units Test: attr 24] expected: FAIL diff --git a/tests/wpt/meta/css/css-values/rlh-on-root-lengths.html.ini b/tests/wpt/meta/css/css-values/rlh-on-root-lengths.html.ini deleted file mode 100644 index 101215d83d6..00000000000 --- a/tests/wpt/meta/css/css-values/rlh-on-root-lengths.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[rlh-on-root-lengths.html] - [Non font or line-height properties on :root should resolve rlh against :root line-height] - expected: FAIL