From df9902e4d072718f3d07c2cd14d8daef9233adaa Mon Sep 17 00:00:00 2001 From: Oriol Brufau Date: Thu, 2 Oct 2025 03:23:05 +0200 Subject: [PATCH] Upgrade Stylo to 2025-10-01 (#39612) This continues #39150 Changelog: - Upstream: https://github.com/servo/stylo/compare/fd700321ccc0434b09bc641099e8761d67733913...b98470a5cbd3792db79366ec1559d72231ef2c1f - Servo fixups: https://github.com/servo/stylo/compare/1040a20611a125ef120082158340bbafa2e2ff66...4ba7bdb4040a909bf3d6e326b229602c93014618 Stylo tracking issue: https://github.com/servo/stylo/issues/247 --------- Signed-off-by: Oriol Brufau --- Cargo.lock | 50 +++++++++++++++----------------- Cargo.toml | 17 +++++------ components/layout/Cargo.toml | 1 - components/layout/layout_impl.rs | 4 +-- components/script/Cargo.toml | 1 - components/script/animations.rs | 2 +- 6 files changed, 35 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4df2de077d6..5f33853242b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4840,7 +4840,6 @@ dependencies = [ "euclid", "fonts", "fonts_traits", - "fxhash", "html5ever", "icu_locid", "icu_segmenter", @@ -7312,7 +7311,6 @@ dependencies = [ "euclid", "fonts", "fonts_traits", - "fxhash", "glow", "headers 0.4.1", "html5ever", @@ -7527,18 +7525,18 @@ dependencies = [ [[package]] name = "selectors" -version = "0.31.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.32.0" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "bitflags 2.9.4", "cssparser", "derive_more 2.0.1", - "fxhash", "log", "new_debug_unreachable", "phf", "phf_codegen", "precomputed-hash", + "rustc-hash 2.1.1", "servo_arc", "smallvec", "to_shmem", @@ -7860,8 +7858,8 @@ dependencies = [ [[package]] name = "servo_arc" -version = "0.4.1" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.4.2" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "serde", "stable_deref_trait", @@ -8373,8 +8371,8 @@ dependencies = [ [[package]] name = "stylo" -version = "0.7.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.8.0" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "app_units", "arrayvec", @@ -8385,7 +8383,6 @@ dependencies = [ "derive_more 2.0.1", "encoding_rs", "euclid", - "fxhash", "icu_segmenter", "indexmap", "itertools 0.14.0", @@ -8404,6 +8401,7 @@ dependencies = [ "precomputed-hash", "rayon", "rayon-core", + "rustc-hash 2.1.1", "selectors", "serde", "servo_arc", @@ -8430,8 +8428,8 @@ dependencies = [ [[package]] name = "stylo_atoms" -version = "0.7.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.8.0" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "string_cache", "string_cache_codegen", @@ -8439,13 +8437,13 @@ dependencies = [ [[package]] name = "stylo_config" -version = "0.7.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.8.0" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" [[package]] name = "stylo_derive" -version = "0.7.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.8.0" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "darling", "proc-macro2", @@ -8456,8 +8454,8 @@ dependencies = [ [[package]] name = "stylo_dom" -version = "0.7.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.8.0" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "bitflags 2.9.4", "stylo_malloc_size_of", @@ -8465,8 +8463,8 @@ dependencies = [ [[package]] name = "stylo_malloc_size_of" -version = "0.7.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.8.0" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "app_units", "cssparser", @@ -8482,13 +8480,13 @@ dependencies = [ [[package]] name = "stylo_static_prefs" -version = "0.7.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.8.0" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" [[package]] name = "stylo_traits" -version = "0.7.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +version = "0.8.0" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "app_units", "bitflags 2.9.4", @@ -8903,7 +8901,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.2.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "cssparser", "servo_arc", @@ -8916,7 +8914,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-09-02#d10ddece8ffe2310e09bf20062fc9c6b223d4fd8" +source = "git+https://github.com/servo/stylo?branch=2025-10-01#4ba7bdb4040a909bf3d6e326b229602c93014618" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index a14731b858a..b6abcc81372 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,6 @@ env_logger = "0.11" euclid = "0.22" fonts_traits = { path = "components/shared/fonts" } freetype-sys = "0.20" -fxhash = "0.2" gleam = "0.15" glow = "0.16.0" gstreamer = { version = "0.23", features = ["v1_18"] } @@ -129,7 +128,7 @@ rustls = { version = "0.23", default-features = false, features = ["logging", "s rustls-pemfile = "2.0" rustls-pki-types = "1.12" script_traits = { path = "components/shared/script" } -selectors = { git = "https://github.com/servo/stylo", branch = "2025-09-02" } +selectors = { git = "https://github.com/servo/stylo", branch = "2025-10-01" } serde = "1.0.228" serde_bytes = "0.11" serde_core = "1.0.226" @@ -138,19 +137,19 @@ 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-09-02" } +servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-10-01" } skrifa = "0.35.0" smallvec = { version = "1.15", features = ["serde", "union"] } storage_traits = { path = "components/shared/storage" } string_cache = "0.8" strum = "0.26" strum_macros = "0.26" -stylo = { git = "https://github.com/servo/stylo", branch = "2025-09-02" } -stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-09-02" } -stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-09-02" } -stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-09-02" } -stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-09-02" } -stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-09-02" } +stylo = { git = "https://github.com/servo/stylo", branch = "2025-10-01" } +stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-10-01" } +stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-10-01" } +stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-10-01" } +stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-10-01" } +stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-10-01" } surfman = { version = "0.10.0", features = ["chains"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } synstructure = "0.13" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 9b61883a51a..f43b5c76937 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -28,7 +28,6 @@ embedder_traits = { workspace = true } euclid = { workspace = true } fonts = { path = "../fonts" } fonts_traits = { workspace = true } -fxhash = { workspace = true } html5ever = { workspace = true } icu_locid = { workspace = true } icu_segmenter = { workspace = true } diff --git a/components/layout/layout_impl.rs b/components/layout/layout_impl.rs index 7b908e45534..2d4cfefaeba 100644 --- a/components/layout/layout_impl.rs +++ b/components/layout/layout_impl.rs @@ -1433,7 +1433,7 @@ struct RegisteredPainterImpl { painter: Box, name: Atom, // FIXME: Should be a PrecomputedHashMap. - properties: fxhash::FxHashMap, + properties: FxHashMap, } impl SpeculativePainter for RegisteredPainterImpl { @@ -1448,7 +1448,7 @@ impl SpeculativePainter for RegisteredPainterImpl { } impl RegisteredSpeculativePainter for RegisteredPainterImpl { - fn properties(&self) -> &fxhash::FxHashMap { + fn properties(&self) -> &FxHashMap { &self.properties } fn name(&self) -> Atom { diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 7e32d1ef6e1..c2a5953a556 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -67,7 +67,6 @@ encoding_rs = { workspace = true } euclid = { workspace = true } fonts = { path = "../fonts" } fonts_traits = { workspace = true } -fxhash = { workspace = true } glow = { workspace = true } headers = { workspace = true } html5ever = { workspace = true } diff --git a/components/script/animations.rs b/components/script/animations.rs index 73323f84f59..3a7b3c191aa 100644 --- a/components/script/animations.rs +++ b/components/script/animations.rs @@ -10,8 +10,8 @@ use base::id::PipelineId; use constellation_traits::ScriptToConstellationMessage; use cssparser::ToCss; use embedder_traits::{AnimationState as AnimationsPresentState, UntrustedNodeAddress}; -use fxhash::{FxHashMap, FxHashSet}; use libc::c_void; +use rustc_hash::{FxHashMap, FxHashSet}; use serde::{Deserialize, Serialize}; use style::animation::{ Animation, AnimationSetKey, AnimationState, DocumentAnimationSet, ElementAnimationSet,