Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Stylo to 2025-06-03 (#37444)

Browse source 
This continues #36835

Changelog:
- Upstream:
ca369cbc83...7e2201c32c
- Servo fixups:
f387e6396c...2e1f66b068

Stylo tracking issue: https://github.com/servo/stylo/issues/200

---------

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-06-19 14:30:32 +02:00 • committed by GitHub
parent e5c328d660
commit b394727ff6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 63 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Cargo.lock generated
View file

@ -1598,6 +1598,26 @@ dependencies = [
"syn", "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]] [[package]]
name = "devtools" name = "devtools"
version = "0.0.1" version = "0.0.1"
@ -6787,12 +6807,12 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.28.0" version = "0.29.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 = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"cssparser", "cssparser",
"derive_more", "derive_more 2.0.1",
"fxhash", "fxhash",
"log", "log",
"new_debug_unreachable", "new_debug_unreachable",
@ -7083,7 +7103,7 @@ dependencies = [
[[package]] [[package]]
name = "servo_arc" name = "servo_arc"
version = "0.4.1" 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 = [ dependencies = [
"serde", "serde",
"stable_deref_trait", "stable_deref_trait",
@ -7547,8 +7567,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo" name = "stylo"
version = "0.3.0" version = "0.4.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 = [ dependencies = [
"app_units", "app_units",
"arrayvec", "arrayvec",
@ -7556,7 +7576,7 @@ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"byteorder", "byteorder",
"cssparser", "cssparser",
"derive_more", "derive_more 2.0.1",
"encoding_rs", "encoding_rs",
"euclid", "euclid",
"fxhash", "fxhash",
@ -7604,8 +7624,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo_atoms" name = "stylo_atoms"
version = "0.3.0" version = "0.4.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 = [ dependencies = [
"string_cache", "string_cache",
"string_cache_codegen", "string_cache_codegen",
@ -7613,13 +7633,13 @@ dependencies = [
[[package]] [[package]]
name = "stylo_config" name = "stylo_config"
version = "0.3.0" version = "0.4.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"
[[package]] [[package]]
name = "stylo_derive" name = "stylo_derive"
version = "0.3.0" version = "0.4.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 = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -7630,8 +7650,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo_dom" name = "stylo_dom"
version = "0.3.0" version = "0.4.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 = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"stylo_malloc_size_of", "stylo_malloc_size_of",
@ -7639,8 +7659,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo_malloc_size_of" name = "stylo_malloc_size_of"
version = "0.3.0" version = "0.4.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 = [ dependencies = [
"app_units", "app_units",
"cssparser", "cssparser",
@ -7656,13 +7676,13 @@ dependencies = [
[[package]] [[package]]
name = "stylo_static_prefs" name = "stylo_static_prefs"
version = "0.3.0" version = "0.4.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"
[[package]] [[package]]
name = "stylo_traits" name = "stylo_traits"
version = "0.3.0" version = "0.4.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 = [ dependencies = [
"app_units", "app_units",
"bitflags 2.9.1", "bitflags 2.9.1",
@ -8079,7 +8099,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "to_shmem" name = "to_shmem"
version = "0.2.0" 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 = [ dependencies = [
"cssparser", "cssparser",
"servo_arc", "servo_arc",
@ -8092,7 +8112,7 @@ dependencies = [
[[package]] [[package]]
name = "to_shmem_derive" name = "to_shmem_derive"
version = "0.1.0" 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 = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -9038,7 +9058,7 @@ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"build-parallel", "build-parallel",
"byteorder", "byteorder",
"derive_more", "derive_more 0.99.20",
"etagere", "etagere",
"euclid", "euclid",
"fxhash", "fxhash",

16
Cargo.toml
View file

@ -120,7 +120,7 @@ rustls-pemfile = "2.0"
rustls-pki-types = "1.12" rustls-pki-types = "1.12"
script_layout_interface = { path = "components/shared/script_layout" } script_layout_interface = { path = "components/shared/script_layout" }
script_traits = { path = "components/shared/script" } 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 = "1.0.219"
serde_bytes = "0.11" serde_bytes = "0.11"
serde_json = "1.0" 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-dummy = { git = "https://github.com/servo/media" }
servo-media-gstreamer = { git = "https://github.com/servo/media" } servo-media-gstreamer = { git = "https://github.com/servo/media" }
servo-tracing = { path = "components/servo_tracing" } 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" smallbitvec = "2.6.0"
smallvec = "1.15" smallvec = "1.15"
snapshot = { path = "./components/shared/snapshot" } snapshot = { path = "./components/shared/snapshot" }
@ -137,12 +137,12 @@ string_cache = "0.8"
string_cache_codegen = "0.5" string_cache_codegen = "0.5"
strum = "0.26" strum = "0.26"
strum_macros = "0.26" strum_macros = "0.26"
stylo = { 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-05-01" } stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-06-03" }
stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-06-03" }
stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-06-03" }
stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-06-03" }
stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-05-01" } stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-06-03" }
surfman = { git = "https://github.com/servo/surfman", rev = "f7688b4585f9e0b5d4bf8ee8e4a91e82349610b1", features = ["chains"] } surfman = { git = "https://github.com/servo/surfman", rev = "f7688b4585f9e0b5d4bf8ee8e4a91e82349610b1", features = ["chains"] }
syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
synstructure = "0.13" synstructure = "0.13"

1
components/layout/context.rs
View file

@ -311,6 +311,7 @@ impl LayoutContext<'_> {
}) })
}) })
}, },
Image::LightDark(..) => unreachable!("light-dark() should be disabled"),
} }
} }
} }

1
components/layout/lists.rs
View file

@ -35,6 +35,7 @@ pub(crate) fn make_marker<'dom>(
Image::CrossFade(..) | Image::CrossFade(..) |
Image::PaintWorklet(..) | Image::PaintWorklet(..) |
Image::None => None, Image::None => None,
Image::LightDark(..) => unreachable!("light-dark() should be disabled"),
}; };
let content = marker_image().or_else(|| { let content = marker_image().or_else(|| {
Some(vec![PseudoElementContentItem::Text( Some(vec![PseudoElementContentItem::Text(

3
deny.toml
View file

@ -171,6 +171,9 @@ skip = [
"rand_core", "rand_core",
"wasi", "wasi",
"webpki-roots", "webpki-roots",
# Stylo uses 2.0, WebRender uses 0.99
"derive_more",
] ]
# github.com organizations to allow git sources for # github.com organizations to allow git sources for

3
tests/wpt/meta/css/css-color/light-dark-currentcolor-in-color.html.ini vendored Normal file
View file

@ -0,0 +1,3 @@
[light-dark-currentcolor-in-color.html]
[curentColor in light-dark() refers to parent color]
expected: FAIL

2
tests/wpt/meta/css/css-color/light-dark-currentcolor.html.ini vendored
View file

@ -1,2 +0,0 @@
[light-dark-currentcolor.html]
expected: FAIL

2
tests/wpt/meta/css/css-color/light-dark-inheritance.html.ini vendored
View file

@ -1,2 +0,0 @@
[light-dark-inheritance.html]
expected: FAIL

6
tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini vendored
View file

@ -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)'] [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 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()))'] [Property color value 'LCH(from var(--accent) l c calc(h + 180 * sibling-index()))']
expected: FAIL expected: FAIL

3
tests/wpt/meta/css/css-easing/timing-functions-syntax-valid.html.ini vendored
View file

@ -20,9 +20,6 @@
[e.style['animation-timing-function'\] = "steps(calc(-10), start)" should set the property value] [e.style['animation-timing-function'\] = "steps(calc(-10), start)" should set the property value]
expected: FAIL 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] [e.style['animation-timing-function'\] = "steps(calc(1), jump-none)" should set the property value]
expected: FAIL expected: FAIL

6
tests/wpt/meta/css/css-nesting/nested-declarations-cssom-whitespace.html.ini vendored
View file

@ -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

3
tests/wpt/meta/css/css-values/attr-all-types.html.ini vendored
View file

@ -41,6 +41,9 @@
[CSS Values and Units Test: attr 17] [CSS Values and Units Test: attr 17]
expected: FAIL expected: FAIL
[CSS Values and Units Test: attr 20]
expected: FAIL
[CSS Values and Units Test: attr 24] [CSS Values and Units Test: attr 24]
expected: FAIL expected: FAIL

3
tests/wpt/meta/css/css-values/rlh-on-root-lengths.html.ini vendored
View file

@ -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