diff --git a/Cargo.lock b/Cargo.lock index f213ce0d428..9a03ad79d60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4557,7 +4557,7 @@ dependencies = [ [[package]] name = "malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "app_units", "cssparser", @@ -6577,7 +6577,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.26.0" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "bitflags 2.9.0", "cssparser", @@ -6862,7 +6862,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.0" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "serde", "stable_deref_trait", @@ -7294,7 +7294,7 @@ dependencies = [ [[package]] name = "style" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "app_units", "arrayvec", @@ -7352,7 +7352,7 @@ dependencies = [ [[package]] name = "style_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "darling", "proc-macro2", @@ -7382,7 +7382,7 @@ dependencies = [ [[package]] name = "style_traits" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "app_units", "bitflags 2.9.0", @@ -7404,7 +7404,7 @@ dependencies = [ [[package]] name = "stylo_atoms" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "string_cache", "string_cache_codegen", @@ -7413,15 +7413,12 @@ dependencies = [ [[package]] name = "stylo_config" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" -dependencies = [ - "lazy_static", -] +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" [[package]] name = "stylo_dom" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "bitflags 2.9.0", "malloc_size_of", @@ -7430,7 +7427,7 @@ dependencies = [ [[package]] name = "stylo_static_prefs" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" [[package]] name = "subtle" @@ -7797,7 +7794,7 @@ dependencies = [ [[package]] name = "to_shmem" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "cssparser", "servo_arc", @@ -7810,7 +7807,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" +source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index e5946388f4a..e7a145df042 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,25 +117,25 @@ rustls-pemfile = "2.0" rustls-pki-types = "1.11" script_layout_interface = { path = "components/shared/script_layout" } script_traits = { path = "components/shared/script" } -selectors = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } +selectors = { git = "https://github.com/servo/stylo", branch = "2025-03-12" } serde = "1.0.219" serde_bytes = "0.11" serde_json = "1.0" 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_arc = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] } -stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } +servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-03-12", features = ["servo"] } +stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-03-12" } smallbitvec = "2.6.0" smallvec = "1.14" static_assertions = "1.1" string_cache = "0.8" string_cache_codegen = "0.5" -style = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] } -stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } -stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } -style_malloc_size_of = { package = "malloc_size_of", git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] } -style_traits = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] } +style = { git = "https://github.com/servo/stylo", branch = "2025-03-12", features = ["servo"] } +stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-03-12" } +stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-03-12" } +style_malloc_size_of = { package = "malloc_size_of", git = "https://github.com/servo/stylo", branch = "2025-03-12", features = ["servo"] } +style_traits = { git = "https://github.com/servo/stylo", branch = "2025-03-12", features = ["servo"] } 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/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs index ecadf8f28d9..26d71b69f4b 100644 --- a/components/malloc_size_of/lib.rs +++ b/components/malloc_size_of/lib.rs @@ -720,6 +720,7 @@ malloc_size_of_is_0!(std::time::Duration); malloc_size_of_is_0!(std::time::Instant); malloc_size_of_is_0!(std::time::SystemTime); malloc_size_of_is_0!(style::font_face::SourceList); +malloc_size_of_is_0!(style::queries::values::PrefersColorScheme); macro_rules! malloc_size_of_is_webrender_malloc_size_of( ($($ty:ty),+) => ( @@ -792,7 +793,6 @@ malloc_size_of_is_style_malloc_size_of!(style::dom::OpaqueNode); malloc_size_of_is_style_malloc_size_of!(style::invalidation::element::restyle_hints::RestyleHint); malloc_size_of_is_style_malloc_size_of!(style::media_queries::MediaList); malloc_size_of_is_style_malloc_size_of!(style::properties::style_structs::Font); -malloc_size_of_is_style_malloc_size_of!(style::queries::values::PrefersColorScheme); malloc_size_of_is_style_malloc_size_of!(style::selector_parser::PseudoElement); malloc_size_of_is_style_malloc_size_of!(style::selector_parser::RestyleDamage); malloc_size_of_is_style_malloc_size_of!(style::selector_parser::Snapshot);