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

Upgrade Stylo to 2025-09-02 (#39150)

Browse source 
This continues #38429

Changelog:
- Upstream:
ec21cec41c...fd700321cc
- Servo fixups:
30f8960428...64d8521f1b

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

---------

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-09-04 23:28:24 +02:00 • committed by GitHub
parent 40ced5bb61
commit 589a750cac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 35 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Cargo.lock generated
View file

@ -7541,7 +7541,7 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.31.0" version = "0.31.0"
source = "git+https://github.com/servo/stylo?branch=2025-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"bitflags 2.9.4", "bitflags 2.9.4",
"cssparser", "cssparser",
@ -7860,7 +7860,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-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"serde", "serde",
"stable_deref_trait", "stable_deref_trait",
@ -8338,8 +8338,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo" name = "stylo"
version = "0.6.0" version = "0.7.0"
source = "git+https://github.com/servo/stylo?branch=2025-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"app_units", "app_units",
"arrayvec", "arrayvec",
@ -8395,8 +8395,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo_atoms" name = "stylo_atoms"
version = "0.6.0" version = "0.7.0"
source = "git+https://github.com/servo/stylo?branch=2025-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"string_cache", "string_cache",
"string_cache_codegen", "string_cache_codegen",
@ -8404,13 +8404,13 @@ dependencies = [
[[package]] [[package]]
name = "stylo_config" name = "stylo_config"
version = "0.6.0" version = "0.7.0"
source = "git+https://github.com/servo/stylo?branch=2025-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
[[package]] [[package]]
name = "stylo_derive" name = "stylo_derive"
version = "0.6.0" version = "0.7.0"
source = "git+https://github.com/servo/stylo?branch=2025-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -8421,8 +8421,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo_dom" name = "stylo_dom"
version = "0.6.0" version = "0.7.0"
source = "git+https://github.com/servo/stylo?branch=2025-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"bitflags 2.9.4", "bitflags 2.9.4",
"stylo_malloc_size_of", "stylo_malloc_size_of",
@ -8430,8 +8430,8 @@ dependencies = [
[[package]] [[package]]
name = "stylo_malloc_size_of" name = "stylo_malloc_size_of"
version = "0.6.0" version = "0.7.0"
source = "git+https://github.com/servo/stylo?branch=2025-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"app_units", "app_units",
"cssparser", "cssparser",
@ -8447,13 +8447,13 @@ dependencies = [
[[package]] [[package]]
name = "stylo_static_prefs" name = "stylo_static_prefs"
version = "0.6.0" version = "0.7.0"
source = "git+https://github.com/servo/stylo?branch=2025-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
[[package]] [[package]]
name = "stylo_traits" name = "stylo_traits"
version = "0.6.0" version = "0.7.0"
source = "git+https://github.com/servo/stylo?branch=2025-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"app_units", "app_units",
"bitflags 2.9.4", "bitflags 2.9.4",
@ -8867,7 +8867,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-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"cssparser", "cssparser",
"servo_arc", "servo_arc",
@ -8880,7 +8880,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-08-01#35cd8025bb3d5c4cc50db80cb65f9b1840e5ac5a" source = "git+https://github.com/servo/stylo?branch=2025-09-02#64d8521f1b8509a0160a89e24d0ace2883fa3269"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",

16
Cargo.toml
View file

@ -128,7 +128,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-08-01" } selectors = { git = "https://github.com/servo/stylo", branch = "2025-09-02" }
serde = "1.0.219" serde = "1.0.219"
serde_bytes = "0.11" serde_bytes = "0.11"
serde_json = "1.0" serde_json = "1.0"
@ -136,18 +136,18 @@ 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-08-01" } servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-09-02" }
skrifa = "0.35.0" skrifa = "0.35.0"
smallvec = { version = "1.15", features = ["serde", "union"] } smallvec = { version = "1.15", features = ["serde", "union"] }
string_cache = "0.8" string_cache = "0.8"
strum = "0.26" strum = "0.26"
strum_macros = "0.26" strum_macros = "0.26"
stylo = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } stylo = { git = "https://github.com/servo/stylo", branch = "2025-09-02" }
stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-09-02" }
stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-09-02" }
stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-09-02" }
stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-09-02" }
stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-09-02" }
surfman = { version = "0.10.0", features = ["chains"] } surfman = { version = "0.10.0", 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"

8
components/layout/query.rs
View file

@ -468,7 +468,13 @@ fn shorthand_to_css_string(
let mut dest = String::new(); let mut dest = String::new();
for longhand in id.longhands() { for longhand in id.longhands() {
block.push( block.push(
style.computed_or_resolved_declaration(longhand, Some(&Context { style })), style.computed_or_resolved_declaration(
longhand,
Some(&Context {
style,
for_property: longhand.into(),
}),
),
Importance::Normal, Importance::Normal,
); );
} }

18
tests/wpt/meta/css/css-transforms/parsing/rotate-parsing-computed.html.ini vendored
View file

@ -1,18 +0,0 @@
[rotate-parsing-computed.html]
[Property rotate value '-0.5 0 0 400grad']
expected: FAIL
[Property rotate value '-1 0 0 400grad']
expected: FAIL
[Property rotate value '0 -0.5 0 400grad']
expected: FAIL
[Property rotate value '0 -1 0 400grad']
expected: FAIL
[Property rotate value '0 0 -0.5 400grad']
expected: FAIL
[Property rotate value '0 0 -1 400grad']
expected: FAIL

21
tests/wpt/meta/css/css-transforms/parsing/rotate-parsing-valid.html.ini vendored
View file

@ -1,21 +0,0 @@
[rotate-parsing-valid.html]
[e.style['rotate'\] = "z 400grad" should set the property value]
expected: FAIL
[e.style['rotate'\] = "-0.5 0 0 400grad" should set the property value]
expected: FAIL
[e.style['rotate'\] = "-1 0 0 400grad" should set the property value]
expected: FAIL
[e.style['rotate'\] = "0 -0.5 0 400grad" should set the property value]
expected: FAIL
[e.style['rotate'\] = "0 -1 0 400grad" should set the property value]
expected: FAIL
[e.style['rotate'\] = "0 0 -0.5 400grad" should set the property value]
expected: FAIL
[e.style['rotate'\] = "0 0 -1 400grad" should set the property value]
expected: FAIL