Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-23 13:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Stylo to 2025-08-01 (#38429)

Browse source 
This continues #37822

Changelog:
- Upstream:
fe9eadf47b...ec21cec41c
- Servo fixups:
29052e550f...7f8df16fdd

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

---------

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-08-02 14:48:33 -07:00 • committed by GitHub
parent a7b232ef4c
commit 76e5758ab9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Cargo.lock generated
View file

@ -7310,8 +7310,8 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.30.0" version = "0.31.0"
source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"cssparser", "cssparser",
@ -7617,7 +7617,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-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"serde", "serde",
"stable_deref_trait", "stable_deref_trait",
@ -8088,8 +8088,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo" name = "stylo"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"app_units", "app_units",
"arrayvec", "arrayvec",
@ -8145,8 +8145,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo_atoms" name = "stylo_atoms"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"string_cache", "string_cache",
"string_cache_codegen", "string_cache_codegen",
@ -8154,13 +8154,13 @@ dependencies = [
[[package]] [[package]]
name = "stylo_config" name = "stylo_config"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
[[package]] [[package]]
name = "stylo_derive" name = "stylo_derive"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -8171,8 +8171,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo_dom" name = "stylo_dom"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"stylo_malloc_size_of", "stylo_malloc_size_of",
@ -8180,8 +8180,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo_malloc_size_of" name = "stylo_malloc_size_of"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"app_units", "app_units",
"cssparser", "cssparser",
@ -8197,13 +8197,13 @@ dependencies = [
[[package]] [[package]]
name = "stylo_static_prefs" name = "stylo_static_prefs"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
[[package]] [[package]]
name = "stylo_traits" name = "stylo_traits"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"app_units", "app_units",
"bitflags 2.9.1", "bitflags 2.9.1",
@ -8618,7 +8618,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-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"cssparser", "cssparser",
"servo_arc", "servo_arc",
@ -8631,7 +8631,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-07-01#22df130e1485834f336b8543e5f12b9e717ca620" source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",

16
Cargo.toml
View file

@ -124,7 +124,7 @@ rustls = { version = "0.23", default-features = false, features = ["logging", "s
rustls-pemfile = "2.0" rustls-pemfile = "2.0"
rustls-pki-types = "1.12" rustls-pki-types = "1.12"
script_traits = { path = "components/shared/script" } script_traits = { path = "components/shared/script" }
selectors = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } selectors = { git = "https://github.com/servo/stylo", branch = "2025-08-01" }
serde = "1.0.219" serde = "1.0.219"
serde_bytes = "0.11" serde_bytes = "0.11"
serde_json = "1.0" serde_json = "1.0"
@ -132,7 +132,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-07-01" } servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-08-01" }
smallbitvec = "2.6.0" smallbitvec = "2.6.0"
smallvec = { version = "1.15", features = ["serde", "union"] } smallvec = { version = "1.15", features = ["serde", "union"] }
static_assertions = "1.1" static_assertions = "1.1"
@ -140,12 +140,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-07-01" } stylo = { git = "https://github.com/servo/stylo", branch = "2025-08-01" }
stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-08-01" }
stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-08-01" }
stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-08-01" }
stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-08-01" }
stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-08-01" }
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"

2
tests/wpt/meta/css/css-cascade/import-conditional-002.html.ini vendored
View file

@ -1,2 +0,0 @@
[import-conditional-002.html]
expected: FAIL

36
tests/wpt/meta/css/css-cascade/import-conditions.html.ini vendored
View file

@ -1,37 +1,4 @@
[import-conditions.html] [import-conditions.html]
[supports(display:block) is a valid import condition]
expected: FAIL
[supports((display:flex)) is a valid import condition]
expected: FAIL
[supports((display:block) and (display:flex)) is a valid import condition]
expected: FAIL
[supports((display:block) or (display:flex)) is a valid import condition]
expected: FAIL
[supports((display:block) or (foo:bar)) is a valid import condition]
expected: FAIL
[supports(display: block !important) is a valid import condition]
expected: FAIL
[supports(display:block) (width >= 0px) is a valid import condition]
expected: FAIL
[supports(selector(a)) is a valid import condition]
expected: FAIL
[supports(selector(p a)) is a valid import condition]
expected: FAIL
[supports(selector(p > a)) is a valid import condition]
expected: FAIL
[supports(selector(p + a)) is a valid import condition]
expected: FAIL
[supports(font-tech(color-COLRv1)) is a valid import condition] [supports(font-tech(color-COLRv1)) is a valid import condition]
expected: FAIL expected: FAIL
@ -43,6 +10,3 @@
[layer(A.B) supports(font-format(opentype)) is a valid import condition] [layer(A.B) supports(font-format(opentype)) is a valid import condition]
expected: FAIL expected: FAIL
[layer supports(selector(a)) is a valid import condition]
expected: FAIL