Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Stylo to 2025-03-01 (#35925)

Browse source 
Signed-off-by: Nico Burns <nico@nicoburns.com>
This commit is contained in:
Nico Burns 2025-03-12 19:30:49 +13:00 • committed by GitHub
parent 8034216d06
commit d57dbb4d47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Cargo.lock generated
View file

@ -4557,7 +4557,7 @@ dependencies = [
[[package]] [[package]]
name = "malloc_size_of" name = "malloc_size_of"
version = "0.0.1" 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 = [ dependencies = [
"app_units", "app_units",
"cssparser", "cssparser",
@ -6577,7 +6577,7 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.26.0" 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 = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"cssparser", "cssparser",
@ -6862,7 +6862,7 @@ dependencies = [
[[package]] [[package]]
name = "servo_arc" name = "servo_arc"
version = "0.4.0" 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 = [ dependencies = [
"serde", "serde",
"stable_deref_trait", "stable_deref_trait",
@ -7294,7 +7294,7 @@ dependencies = [
[[package]] [[package]]
name = "style" name = "style"
version = "0.0.1" 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 = [ dependencies = [
"app_units", "app_units",
"arrayvec", "arrayvec",
@ -7352,7 +7352,7 @@ dependencies = [
[[package]] [[package]]
name = "style_derive" name = "style_derive"
version = "0.0.1" 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 = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -7382,7 +7382,7 @@ dependencies = [
[[package]] [[package]]
name = "style_traits" name = "style_traits"
version = "0.0.1" 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 = [ dependencies = [
"app_units", "app_units",
"bitflags 2.9.0", "bitflags 2.9.0",
@ -7404,7 +7404,7 @@ dependencies = [
[[package]] [[package]]
name = "stylo_atoms" name = "stylo_atoms"
version = "0.1.0" 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 = [ dependencies = [
"string_cache", "string_cache",
"string_cache_codegen", "string_cache_codegen",
@ -7413,15 +7413,12 @@ dependencies = [
[[package]] [[package]]
name = "stylo_config" name = "stylo_config"
version = "0.1.0" 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 = [
"lazy_static",
]
[[package]] [[package]]
name = "stylo_dom" name = "stylo_dom"
version = "0.1.0" 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 = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"malloc_size_of", "malloc_size_of",
@ -7430,7 +7427,7 @@ dependencies = [
[[package]] [[package]]
name = "stylo_static_prefs" name = "stylo_static_prefs"
version = "0.1.0" 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]] [[package]]
name = "subtle" name = "subtle"
@ -7797,7 +7794,7 @@ dependencies = [
[[package]] [[package]]
name = "to_shmem" name = "to_shmem"
version = "0.1.0" 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 = [ dependencies = [
"cssparser", "cssparser",
"servo_arc", "servo_arc",
@ -7810,7 +7807,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-03-01#940d249bcda147836d8b304c8e569a38107b4b4d" source = "git+https://github.com/servo/stylo?branch=2025-03-12#9f79a70177b83ead3b990d63de55fbd715cbf71a"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",

16
Cargo.toml
View file

@ -117,25 +117,25 @@ rustls-pemfile = "2.0"
rustls-pki-types = "1.11" rustls-pki-types = "1.11"
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-03-01" } selectors = { git = "https://github.com/servo/stylo", branch = "2025-03-12" }
serde = "1.0.219" serde = "1.0.219"
serde_bytes = "0.11" serde_bytes = "0.11"
serde_json = "1.0" serde_json = "1.0"
servo-media = { git = "https://github.com/servo/media" } 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_arc = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] } 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-01" } stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-03-12" }
smallbitvec = "2.6.0" smallbitvec = "2.6.0"
smallvec = "1.14" smallvec = "1.14"
static_assertions = "1.1" static_assertions = "1.1"
string_cache = "0.8" string_cache = "0.8"
string_cache_codegen = "0.5" string_cache_codegen = "0.5"
style = { 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-01" } stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-03-12" }
stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } 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-01", features = ["servo"] } 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-01", 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"] } 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
components/malloc_size_of/lib.rs
View file

@ -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::Instant);
malloc_size_of_is_0!(std::time::SystemTime); malloc_size_of_is_0!(std::time::SystemTime);
malloc_size_of_is_0!(style::font_face::SourceList); 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( macro_rules! malloc_size_of_is_webrender_malloc_size_of(
($($ty:ty),+) => ( ($($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::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::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::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::PseudoElement);
malloc_size_of_is_style_malloc_size_of!(style::selector_parser::RestyleDamage); malloc_size_of_is_style_malloc_size_of!(style::selector_parser::RestyleDamage);
malloc_size_of_is_style_malloc_size_of!(style::selector_parser::Snapshot); malloc_size_of_is_style_malloc_size_of!(style::selector_parser::Snapshot);