diff --git a/Cargo.lock b/Cargo.lock index d704a22..e25e812 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -336,7 +336,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -347,7 +347,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -494,7 +494,7 @@ checksum = "ae36dc4177970ef04fde5178d3e2429882def40e57a451f919c098f72baa6cec" dependencies = [ "proc-macro2", "quote", - "syn 3.0.2", + "syn 3.0.3", ] [[package]] @@ -1431,9 +1431,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.3" +version = "4.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fb99565819980999fb7b4a1796046a5c949e6d4ff132cf5fadf5a641e20d776" +checksum = "d91e0c145792ef73a6ad36d27c75ac09f1832222a3c209689d90f534685ee5b7" dependencies = [ "clap_builder", "clap_derive", @@ -1462,14 +1462,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.3" +version = "4.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f2392eae7f16557a3d727ef3a12e57b2b2ca6f98566a5f4fb41ffe305df077" +checksum = "d012d2b9d65aca7f18f4d9878a045bc17899bba951561ba5ec3c2ba1eed9a061" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] @@ -2092,7 +2092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccc2776f0c61eca1ca32528f85548abd1a4be8fb53d1b21c013e4f18da1e7090" dependencies = [ "data-encoding", - "syn 2.0.119", + "syn 1.0.109", ] [[package]] @@ -2300,7 +2300,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2697,7 +2697,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2913,9 +2913,9 @@ dependencies = [ [[package]] name = "font-types" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad67eced03f5504d9cbd3a879b5958b5c54d4e5fd794361c6eb21b05fb703411" +checksum = "0a7299a780854a6d391be2ae1c8521c9368471b559dbfd6a8dbd9f407eaff100" dependencies = [ "bytemuck", ] @@ -2968,13 +2968,13 @@ dependencies = [ [[package]] name = "foreign-types-macros" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] @@ -3227,7 +3227,7 @@ dependencies = [ "libc", "log", "rustversion", - "windows-link 0.2.1", + "windows-link 0.1.3", "windows-result 0.4.1", ] @@ -3368,7 +3368,7 @@ dependencies = [ "gobject-sys 0.22.6", "libc", "system-deps 7.0.8", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5574,7 +5574,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5936,9 +5936,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.188" +version = "0.2.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22053b6a34f84abc97f9129e61334f40174659a1b9bd18c970b83db6a9a6348b" +checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" [[package]] name = "libdbus-sys" @@ -6380,9 +6380,9 @@ dependencies = [ [[package]] name = "mozjs" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944a45d394b89149fac577c90c5011043ecda76d41b383a305e68678f4c4039f" +checksum = "4a6420d19b6156c4da540ed91a4dd395271009aefaf1127291098d58d49daa21" dependencies = [ "bindgen", "cc", @@ -6395,9 +6395,9 @@ dependencies = [ [[package]] name = "mozjs_sys" -version = "140.12.0-2" +version = "140.13.0-0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf1645d99277fe604091a848fecbde7b9b595cbc3a592247a68d954c8acb596" +checksum = "cc6e165f0cafe59573217f788efb4c3def70c915c8107abaf89791b7ec56850d" dependencies = [ "bindgen", "cc", @@ -6863,7 +6863,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -8006,7 +8006,7 @@ checksum = "7da1d65da6dd5d1e44199ac0f58712d241c0f439f80adea8924d832384087f85" dependencies = [ "base64 0.22.1", "indexmap", - "quick-xml 0.41.0", + "quick-xml", "serde", "time", ] @@ -8400,9 +8400,9 @@ dependencies = [ [[package]] name = "psl" -version = "2.1.219" +version = "2.1.220" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c29b88c3f8002851c2571f798b898d257cec88d40246523af0afc7e6b30b3640" +checksum = "de177021aa731f88221b3ae411cb89d70f66e51487c26ef9c9f65fc7250c22e8" dependencies = [ "psl-types", ] @@ -8448,15 +8448,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" -[[package]] -name = "quick-xml" -version = "0.39.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" -dependencies = [ - "memchr", -] - [[package]] name = "quick-xml" version = "0.41.0" @@ -8541,7 +8532,7 @@ dependencies = [ "once_cell", "socket2 0.6.5", "tracing", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -8770,7 +8761,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709" dependencies = [ "bytemuck", - "font-types 0.12.1", + "font-types 0.12.2", "once_cell", ] @@ -9149,7 +9140,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -9182,9 +9173,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046" +checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" dependencies = [ "web-time", "zeroize", @@ -9208,7 +9199,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -9229,7 +9220,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -9421,13 +9412,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] name = "selectors" version = "0.39.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "bitflags 2.13.1", "cssparser", @@ -9511,7 +9502,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.2", + "syn 3.0.3", ] [[package]] @@ -10052,7 +10043,7 @@ dependencies = [ "content-security-policy", "dwrote", "euclid", - "font-types 0.12.1", + "font-types 0.12.2", "fontsan", "freetype-sys", "harfbuzz-sys", @@ -10319,6 +10310,7 @@ dependencies = [ "num-complex", "num-traits", "petgraph", + "rustc-hash 2.1.3", "serde", "servo-base", "servo-malloc-size-of", @@ -11228,7 +11220,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.3" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "serde", "stable_deref_trait", @@ -11528,7 +11520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -11771,7 +11763,7 @@ dependencies = [ [[package]] name = "stylo" version = "0.19.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "app_units", "arrayvec", @@ -11827,7 +11819,7 @@ dependencies = [ [[package]] name = "stylo_atoms" version = "0.19.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "string_cache", "string_cache_codegen", @@ -11836,7 +11828,7 @@ dependencies = [ [[package]] name = "stylo_derive" version = "0.19.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "darling", "proc-macro2", @@ -11848,7 +11840,7 @@ dependencies = [ [[package]] name = "stylo_dom" version = "0.19.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "bitflags 2.13.1", "stylo_malloc_size_of", @@ -11857,7 +11849,7 @@ dependencies = [ [[package]] name = "stylo_malloc_size_of" version = "0.19.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "app_units", "cssparser", @@ -11874,7 +11866,7 @@ dependencies = [ [[package]] name = "stylo_static_prefs" version = "0.19.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "toml 1.1.3+spec-1.1.0", ] @@ -11882,7 +11874,7 @@ dependencies = [ [[package]] name = "stylo_traits" version = "0.19.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "app_units", "bitflags 2.13.1", @@ -11980,6 +11972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", + "quote", "unicode-ident", ] @@ -11996,9 +11989,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a207d6d6a2b7fc470b80443726053f18a2481b7e1eee970597051596567987a3" +checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" dependencies = [ "proc-macro2", "quote", @@ -12132,7 +12125,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -12229,7 +12222,7 @@ checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd" dependencies = [ "proc-macro2", "quote", - "syn 3.0.2", + "syn 3.0.3", ] [[package]] @@ -12418,7 +12411,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.5.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "cssparser", "servo_arc", @@ -12431,7 +12424,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?rev=394aea737f0c9f85ee442898c29053de8abf68d8#394aea737f0c9f85ee442898c29053de8abf68d8" +source = "git+https://github.com/servo/stylo?rev=2d289c14fdf46952d52cabce63b1f0dc55b2ccde#2d289c14fdf46952d52cabce63b1f0dc55b2ccde" dependencies = [ "darling", "proc-macro2", @@ -12479,9 +12472,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" +checksum = "a3d06f0b082ba57c26b79407372e57cf2a1e28124f78e9479fe80322cf53420b" dependencies = [ "futures-core", "pin-project-lite", @@ -12777,7 +12770,7 @@ dependencies = [ "once_cell", "png 0.18.1", "thiserror 2.0.19", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -13311,9 +13304,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d" +checksum = "016ccf01d1c58b6f8999612813e17c9b2390f7d70671428869913310f83f54b8" dependencies = [ "cc", "downcast-rs", @@ -13325,9 +13318,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.14" +version = "0.31.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144" +checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073" dependencies = [ "bitflags 2.13.1", "rustix 1.1.4", @@ -13397,12 +13390,12 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.10" +version = "0.31.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a" +checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0" dependencies = [ "proc-macro2", - "quick-xml 0.39.4", + "quick-xml", "quote", ] @@ -13902,7 +13895,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f485218..23b3d94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -224,7 +224,7 @@ script_webgpu = { package = "servo-script-webgpu", version = "=0.4.0", path = "s script_traits = { package = "servo-script-traits", path = "source/components/shared/script" } sea-query = { version = "1.0.1", default-features = false, features = ["backend-sqlite", "derive"] } sea-query-rusqlite = "0.8.0" -selectors = { git = "https://github.com/servo/stylo", rev = "394aea737f0c9f85ee442898c29053de8abf68d8" } +selectors = { git = "https://github.com/servo/stylo", rev = "2d289c14fdf46952d52cabce63b1f0dc55b2ccde" } seq-macro = "0.3.6" serde = "1.0.228" serde_bytes = "0.11" @@ -264,7 +264,7 @@ servo-wakelock = { version = "0.4.0", path = "source/components/wakelock" } servo-webvtt = { version = "0.4.0", path = "source/components/webvtt" } servo_allocator = { package = "servo-allocator", version = "0.4.0", path = "source/components/allocator" } servo-tracing = { path = "source/components/servo_tracing" } -servo_arc = { git = "https://github.com/servo/stylo", rev = "394aea737f0c9f85ee442898c29053de8abf68d8" } +servo_arc = { git = "https://github.com/servo/stylo", rev = "2d289c14fdf46952d52cabce63b1f0dc55b2ccde" } servo-url = { version = "0.4.0", path = "source/components/url" } sha1 = "0.11" sha2 = "0.11" @@ -276,13 +276,13 @@ storage = { package = "servo-storage", version = "0.4.0", path = "source/compone storage_traits = { package = "servo-storage-traits", path = "source/components/shared/storage" } string_cache = "0.9" strum = { version = "0.27", features = ["derive"] } -stylo = { git = "https://github.com/servo/stylo", rev = "394aea737f0c9f85ee442898c29053de8abf68d8" } -stylo_atoms = { git = "https://github.com/servo/stylo", rev = "394aea737f0c9f85ee442898c29053de8abf68d8" } -stylo_config = { git = "https://github.com/servo/stylo", rev = "394aea737f0c9f85ee442898c29053de8abf68d8" } -stylo_dom = { git = "https://github.com/servo/stylo", rev = "394aea737f0c9f85ee442898c29053de8abf68d8" } -stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "394aea737f0c9f85ee442898c29053de8abf68d8" } -stylo_static_prefs = { git = "https://github.com/servo/stylo", rev = "394aea737f0c9f85ee442898c29053de8abf68d8" } -stylo_traits = { git = "https://github.com/servo/stylo", rev = "394aea737f0c9f85ee442898c29053de8abf68d8" } +stylo = { git = "https://github.com/servo/stylo", rev = "2d289c14fdf46952d52cabce63b1f0dc55b2ccde" } +stylo_atoms = { git = "https://github.com/servo/stylo", rev = "2d289c14fdf46952d52cabce63b1f0dc55b2ccde" } +stylo_config = { git = "https://github.com/servo/stylo", rev = "2d289c14fdf46952d52cabce63b1f0dc55b2ccde" } +stylo_dom = { git = "https://github.com/servo/stylo", rev = "2d289c14fdf46952d52cabce63b1f0dc55b2ccde" } +stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "2d289c14fdf46952d52cabce63b1f0dc55b2ccde" } +stylo_static_prefs = { git = "https://github.com/servo/stylo", rev = "2d289c14fdf46952d52cabce63b1f0dc55b2ccde" } +stylo_traits = { git = "https://github.com/servo/stylo", rev = "2d289c14fdf46952d52cabce63b1f0dc55b2ccde" } surfman = { version = "0.13.0", features = ["chains"] } swapper = "0.1" syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } diff --git a/forkme.lock b/forkme.lock index 7d6fa0e..295f8cf 100644 --- a/forkme.lock +++ b/forkme.lock @@ -1 +1 @@ -f26e5184b554ea5827bdd441bc723217e8e867c1 +428ef53a614c60a7e6716f1c21ace01e5c5fcf2b diff --git a/patches/Cargo.lock.patch b/patches/Cargo.lock.patch index 5cd0e79..c9a8047 100644 --- a/patches/Cargo.lock.patch +++ b/patches/Cargo.lock.patch @@ -603,7 +603,7 @@ "subtle", @@ -7382,6 +7785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046" + checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" dependencies = [ + "web-time", "zeroize", @@ -626,7 +626,7 @@ + +[[package]] name = "serde_json" - version = "1.0.150" + version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8011,6 +8427,7 @@ "rand 0.10.2", @@ -645,7 +645,7 @@ "tracing", ] -@@ -8675,9 +9094,11 @@ +@@ -8676,9 +9095,11 @@ name = "servo-net" version = "0.4.0" dependencies = [ @@ -657,7 +657,7 @@ "base64", "bytes", "chrono", -@@ -8707,6 +9128,7 @@ +@@ -8708,6 +9129,7 @@ "parking_lot", "quick_cache", "regex", @@ -665,7 +665,7 @@ "resvg", "rustc-hash 2.1.3", "rustls", -@@ -8713,9 +9135,11 @@ +@@ -8714,9 +9136,11 @@ "rustls-pki-types", "rustls-platform-verifier", "serde", @@ -677,7 +677,7 @@ "servo-devtools-traits", "servo-embedder-traits", "servo-fonts", -@@ -8768,6 +9192,7 @@ +@@ -8769,6 +9193,7 @@ "rustc-hash 2.1.3", "rustls-pki-types", "serde", @@ -685,7 +685,7 @@ "servo-base", "servo-config", "servo-default-resources", -@@ -8779,8 +9204,10 @@ +@@ -8780,8 +9205,10 @@ "servo-profile-traits", "servo-url", "servo_arc", @@ -696,7 +696,7 @@ "url", "uuid", "webrender_api", -@@ -9390,6 +9817,7 @@ +@@ -9391,6 +9818,7 @@ "bpaf", "cc", "cfg-if", @@ -704,7 +704,7 @@ "crossbeam-channel", "dirs", "dpi", -@@ -9404,6 +9832,7 @@ +@@ -9405,6 +9833,7 @@ "headers", "hilog", "hitrace", @@ -712,7 +712,7 @@ "image", "ipc-channel", "jni 0.22.4", -@@ -9424,6 +9853,7 @@ +@@ -9425,6 +9854,7 @@ "ohos-window-manager-sys", "raw-window-handle", "rustls", @@ -720,7 +720,7 @@ "serde_json", "servo", "servo-allocator", -@@ -9430,6 +9860,7 @@ +@@ -9431,6 +9861,7 @@ "servo-base", "servo-webdriver-server", "signal-hook-registry", @@ -728,7 +728,7 @@ "surfman", "tokio", "tracing", -@@ -10076,6 +10507,9 @@ +@@ -10077,6 +10508,9 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" @@ -738,7 +738,7 @@ [[package]] name = "synstructure" -@@ -10110,6 +10544,27 @@ +@@ -10111,6 +10545,27 @@ ] [[package]] @@ -766,7 +766,7 @@ name = "system-deps" version = "7.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -10135,6 +10590,12 @@ +@@ -10136,6 +10591,12 @@ ] [[package]] @@ -779,7 +779,7 @@ name = "tar" version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -10452,6 +10913,16 @@ +@@ -10453,6 +10914,16 @@ ] [[package]] @@ -796,7 +796,7 @@ name = "tokio-rustls" version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -10553,11 +11024,30 @@ +@@ -10555,11 +11026,30 @@ "futures-util", "pin-project-lite", "sync_wrapper", @@ -827,7 +827,7 @@ name = "tower-layer" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -10872,6 +11362,12 @@ +@@ -10874,6 +11364,12 @@ ] [[package]] @@ -840,7 +840,7 @@ name = "urlpattern" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -11994,6 +12490,17 @@ +@@ -11996,6 +12492,17 @@ ] [[package]] diff --git a/patches/components/layout/display_list/mod.rs.patch b/patches/components/layout/display_list/mod.rs.patch index 5ac5247..448cede 100644 --- a/patches/components/layout/display_list/mod.rs.patch +++ b/patches/components/layout/display_list/mod.rs.patch @@ -1,6 +1,6 @@ --- original +++ modified -@@ -40,17 +40,19 @@ +@@ -41,17 +41,19 @@ use style::values::generics::NonNegative; use style::values::generics::color::ColorOrAuto; use style::values::generics::rect::Rect as StyleRect; @@ -25,7 +25,7 @@ }; use wr::units::LayoutVector2D; -@@ -127,6 +129,9 @@ +@@ -128,6 +130,9 @@ /// Statistics collected about the reflow, in order to write tests for incremental layout. reflow_statistics: &'a mut ReflowStatistics, @@ -35,7 +35,7 @@ } struct InspectorHighlight { -@@ -194,6 +199,34 @@ +@@ -195,6 +200,34 @@ webrender_display_list_builder.dump_serialized_display_list(); } @@ -70,7 +70,7 @@ let _span = profile_traits::trace_span!("DisplayListBuilder::build").entered(); let mut builder = DisplayListBuilder { fragment_tree, -@@ -207,6 +240,7 @@ +@@ -208,6 +241,7 @@ device_pixel_ratio, paint_timing_handler, reflow_statistics, @@ -78,7 +78,7 @@ }; // Clear any caret color from previous display list constructions. -@@ -223,10 +257,15 @@ +@@ -224,10 +258,15 @@ let pipeline_id = builder.paint_info.pipeline_id; let viewport_size = builder.paint_info.viewport_details.size; let viewport_rect = LayoutRect::from_size(viewport_size.cast_unit()); @@ -95,7 +95,7 @@ PrimitiveFlags::default(), (0, 0), /* tag */ ); -@@ -234,6 +273,11 @@ +@@ -235,6 +274,11 @@ PaintTraversal::traverse(&stacking_context_tree.root_stacking_context, &mut builder); builder.paint_dom_inspector_highlight(); @@ -107,7 +107,7 @@ webrender_display_list_builder.end().1 } -@@ -268,14 +312,39 @@ +@@ -269,14 +313,39 @@ } pub(crate) fn add_all_spatial_nodes(&mut self) { @@ -152,7 +152,7 @@ for node in scroll_tree.nodes.iter().skip(2) { let parent_scroll_node_id = node -@@ -414,7 +483,7 @@ +@@ -415,7 +484,7 @@ effects.mix_blend_mode == ComputedMixBlendMode::Normal && !style.has_effective_transform_or_perspective(FragmentFlags::empty()) && style.get_svg().clip_path == ClipPath::None && @@ -161,7 +161,7 @@ { return false; } -@@ -1528,6 +1597,34 @@ +@@ -1546,6 +1615,34 @@ .translate(self.containing_block_origin.to_vector()) .to_webrender(), ); diff --git a/patches/components/script/dom/document/document.rs.patch b/patches/components/script/dom/document/document.rs.patch index 1cc85d3..4453576 100644 --- a/patches/components/script/dom/document/document.rs.patch +++ b/patches/components/script/dom/document/document.rs.patch @@ -33,7 +33,7 @@ #[cfg(any(feature = "webxr", feature = "gamepad"))] use crate::dom::bindings::codegen::Bindings::NavigatorBinding::Navigator_Binding::NavigatorMethods; use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; -@@ -196,7 +201,9 @@ +@@ -198,7 +203,9 @@ use crate::dom::touchevent::TouchEvent as DomTouchEvent; use crate::dom::touchlist::TouchList; use crate::dom::trustedtypes::trustedhtml::TrustedHTML; @@ -44,7 +44,7 @@ use crate::dom::uievent::UIEvent; use crate::dom::websocket::WebSocket; use crate::dom::window::Window; -@@ -216,6 +223,7 @@ +@@ -218,6 +225,7 @@ use crate::task_manager::TaskManager; use crate::task_source::TaskSourceName; use crate::timers::{OneshotTimerCallback, OneshotTimers}; @@ -52,7 +52,7 @@ use crate::xpath::parse_expression; #[derive(Clone, Copy, PartialEq)] -@@ -411,6 +419,8 @@ +@@ -413,6 +421,8 @@ applets: MutNullableDom, /// Information about the `` in this [`Document`]. iframes: RefCell, @@ -61,7 +61,7 @@ /// Shared locks used for style attributes, author-origin stylesheets, and user and /// user agent stylesheets in this document. Can be acquired once for accessing many /// objects. This is shared with the owning [`ScriptThread`]. -@@ -652,6 +662,9 @@ +@@ -654,6 +664,9 @@ #[no_trace] favicon: RefCell>, @@ -71,7 +71,7 @@ /// All websockets created that are associated with this document. websockets: DOMTracker, -@@ -705,6 +718,11 @@ +@@ -707,6 +720,11 @@ /// history: MutNullableDom, @@ -83,7 +83,7 @@ } impl Document { -@@ -889,6 +907,68 @@ +@@ -891,6 +909,68 @@ self.dirty_root.take() } @@ -152,7 +152,7 @@ #[inline] pub(crate) fn loader(&self) -> Ref<'_, DocumentLoader> { self.loader.borrow() -@@ -954,6 +1034,12 @@ +@@ -962,6 +1042,12 @@ // Set the document's activity level, reflow if necessary, and suspend or resume timers. self.activity.set(activity); @@ -165,7 +165,7 @@ let media = ServoMedia::get(); let pipeline_id = self.window().pipeline_id(); let client_context_id = -@@ -967,6 +1053,7 @@ +@@ -975,6 +1061,7 @@ self.title_changed(); self.notify_embedder_favicon(); @@ -173,7 +173,7 @@ self.dirty_all_nodes(cx.no_gc()); self.window().resume(cx); media.resume(&client_context_id); -@@ -1354,6 +1441,9 @@ +@@ -1362,6 +1449,9 @@ LoadStatus::Started, )); self.send_to_embedder(EmbedderMsg::Status(self.webview_id(), None)); @@ -183,7 +183,7 @@ } }, DocumentReadyState::Complete => { -@@ -1362,6 +1452,9 @@ +@@ -1370,6 +1460,9 @@ self.webview_id(), LoadStatus::Complete, )); @@ -193,7 +193,7 @@ } update_with_current_instant(&self.navigation_timing.dom_complete); }, -@@ -1442,7 +1535,13 @@ +@@ -1450,7 +1543,13 @@ let window = self.window(); if window.is_top_level() { let title = self.title().map(String::from); @@ -208,7 +208,7 @@ } } -@@ -1451,6 +1550,18 @@ +@@ -1459,6 +1558,18 @@ window.send_to_embedder(msg); } @@ -227,7 +227,7 @@ pub(crate) fn dirty_all_nodes(&self, no_gc: &NoGC) { let root = match self.GetDocumentElement() { Some(root) => root, -@@ -2899,6 +3010,17 @@ +@@ -2907,6 +3018,17 @@ self.iframes.borrow_mut() } @@ -245,7 +245,7 @@ pub(crate) fn set_navigation_start(&self, navigation_start: CrossProcessInstant) { self.interactive_time .borrow_mut() -@@ -3751,6 +3873,7 @@ +@@ -3764,6 +3886,7 @@ anchors: Default::default(), applets: Default::default(), iframes: RefCell::new(IFrameCollection::new()), @@ -253,7 +253,7 @@ shared_style_locks, stylesheets: DomRefCell::new(DocumentStylesheetSet::new()), stylesheet_list: MutNullableDom::new(None), -@@ -3831,6 +3954,7 @@ +@@ -3844,6 +3967,7 @@ active_sandboxing_flag_set: Cell::new(creation_sandboxing_flag_set), creation_sandboxing_flag_set: Cell::new(creation_sandboxing_flag_set), favicon: RefCell::new(None), @@ -261,7 +261,7 @@ websockets: DOMTracker::new(), details_name_groups: Default::default(), protocol_handler_automation_mode: Default::default(), -@@ -3851,6 +3975,7 @@ +@@ -3864,6 +3988,7 @@ )), image_cache, history: Default::default(), @@ -269,7 +269,7 @@ } } -@@ -4879,6 +5004,36 @@ +@@ -4892,6 +5017,36 @@ pub(crate) fn notify_embedder_favicon(&self) { if let Some(ref image) = *self.favicon.borrow() { @@ -306,7 +306,7 @@ self.send_to_embedder(EmbedderMsg::NewFavicon(self.webview_id(), image.clone())); } } -@@ -4957,6 +5112,30 @@ +@@ -4970,6 +5125,30 @@ pub(crate) fn set_iframe_load_in_progress(&self, value: bool) { self.iframe_load_in_progress.set(value) } diff --git a/patches/components/script/dom/html/form_controls/htmlinputelement.rs.patch b/patches/components/script/dom/html/form_controls/htmlinputelement.rs.patch index 99e4419..2fe2e97 100644 --- a/patches/components/script/dom/html/form_controls/htmlinputelement.rs.patch +++ b/patches/components/script/dom/html/form_controls/htmlinputelement.rs.patch @@ -21,7 +21,7 @@ } fn is_password_field(&self) -> bool { -@@ -1958,10 +1963,25 @@ +@@ -1957,10 +1962,25 @@ .hide_embedder_control(self.upcast()); } else if *event_type == *"focus" { let input_type = &*self.input_type(); diff --git a/patches/components/script/dom/node/layout_dom.rs.patch b/patches/components/script/dom/node/layout_dom.rs.patch index ca14ded..99c0366 100644 --- a/patches/components/script/dom/node/layout_dom.rs.patch +++ b/patches/components/script/dom/node/layout_dom.rs.patch @@ -1,6 +1,6 @@ --- original +++ modified -@@ -31,6 +31,7 @@ +@@ -33,6 +33,7 @@ use crate::dom::html::htmlslotelement::HTMLSlotElement; use crate::dom::html::htmltextareaelement::HTMLTextAreaElement; use crate::dom::html::htmlvideoelement::HTMLVideoElement; @@ -8,7 +8,7 @@ use crate::dom::shadowroot::ShadowRoot; use crate::dom::svg::svgsvgelement::SVGSVGElement; use crate::dom::text::Text; -@@ -309,13 +310,27 @@ +@@ -349,13 +350,27 @@ } pub(crate) fn iframe_browsing_context_id(self) -> Option { diff --git a/patches/components/script/dom/window/window.rs.patch b/patches/components/script/dom/window/window.rs.patch index f25e186..11958e8 100644 --- a/patches/components/script/dom/window/window.rs.patch +++ b/patches/components/script/dom/window/window.rs.patch @@ -143,7 +143,7 @@ /// fn Screen(&self, cx: &mut JSContext) -> DomRoot { self.screen.or_init(|| Screen::new(cx, self)) -@@ -3231,9 +3285,33 @@ +@@ -3235,9 +3289,33 @@ &self, input_event: &ConstellationInputEvent, ) -> Option { @@ -180,7 +180,7 @@ } #[expect(unsafe_code)] -@@ -3252,8 +3330,39 @@ +@@ -3256,8 +3334,39 @@ // SAFETY: This is safe because `Window::query_elements_from_point` has ensured that // layout has run and any OpaqueNodes that no longer refer to real nodes are gone. let address = UntrustedNodeAddress(result.node.0 as *const c_void); @@ -221,7 +221,7 @@ cursor: result.cursor, point_in_node: result.point_in_target, point_in_frame, -@@ -3624,17 +3733,19 @@ +@@ -3628,17 +3737,19 @@ } pub(crate) fn send_to_embedder(&self, msg: EmbedderMsg) { @@ -247,7 +247,7 @@ } #[cfg(feature = "webxr")] -@@ -3854,6 +3965,8 @@ +@@ -3858,6 +3969,8 @@ player_context: WindowGLContext, #[cfg(feature = "webgpu")] gpu_id_hub: Arc, inherited_secure_context: Option, @@ -256,7 +256,7 @@ theme: Theme, weak_script_thread: Weak, ) -> DomRoot { -@@ -3878,6 +3991,8 @@ +@@ -3882,6 +3995,8 @@ gpu_id_hub, inherited_secure_context, unminify_js, @@ -265,7 +265,7 @@ Some(font_context), ), caches: Default::default(), -@@ -4148,3 +4263,114 @@ +@@ -4152,3 +4267,114 @@ Window::origin(self) } } diff --git a/patches/components/script/layout_dom/servo_layout_node.rs.patch b/patches/components/script/layout_dom/servo_layout_node.rs.patch index 2278159..8605bde 100644 --- a/patches/components/script/layout_dom/servo_layout_node.rs.patch +++ b/patches/components/script/layout_dom/servo_layout_node.rs.patch @@ -1,6 +1,6 @@ --- original +++ modified -@@ -286,6 +286,10 @@ +@@ -292,6 +292,10 @@ self.node.iframe_pipeline_id() } diff --git a/patches/components/script_bindings/codegen/Bindings.conf.patch b/patches/components/script_bindings/codegen/Bindings.conf.patch index 3b9d0e1..ba96448 100644 --- a/patches/components/script_bindings/codegen/Bindings.conf.patch +++ b/patches/components/script_bindings/codegen/Bindings.conf.patch @@ -39,7 +39,7 @@ 'CookieStore': { 'cx': ['Set', 'Set_', 'Get', 'Get_', 'GetAll', 'GetAll_', 'Delete', 'Delete_'], }, -@@ -420,6 +445,11 @@ +@@ -424,6 +449,11 @@ 'cx': ['CheckValidity', 'GetValidity', 'GetLabels', 'ReportValidity', 'SetValidity', 'States'], }, @@ -51,7 +51,7 @@ 'Event': { 'cx': ['TimeStamp'], }, -@@ -788,6 +818,10 @@ +@@ -792,6 +822,10 @@ 'weakReferenceable': True, }, @@ -62,7 +62,7 @@ 'IDBCursor': { 'cx': ['Key', 'PrimaryKey'] }, -@@ -828,6 +862,10 @@ +@@ -832,6 +866,10 @@ 'cx': ['Thresholds'] }, @@ -73,7 +73,7 @@ 'KeyframeEffect': { 'cx': ['GetKeyframes', 'SetKeyframes'] }, -@@ -899,7 +937,7 @@ +@@ -903,7 +941,7 @@ }, 'Navigator': { @@ -82,7 +82,7 @@ 'Storage', 'Plugins', 'UserActivation', 'WakeLock', 'Xr', 'MediaDevices', 'MediaSession', 'Permissions', 'GetGamepads'], }, -@@ -953,6 +991,10 @@ +@@ -957,6 +995,10 @@ 'cx': ['RegisterPaint'], }, @@ -93,7 +93,7 @@ 'Performance': { 'cx': ['Mark', 'Measure', 'Navigation'], }, -@@ -1334,6 +1376,7 @@ +@@ -1338,6 +1380,7 @@ 'additionalTraits': ['crate::interfaces::WindowHelpers', 'crate::interfaces::HasOrigin'], 'realm': ['CreateImageBitmap', 'CreateImageBitmap_', 'WebdriverCallback', 'GetOpener', 'Fetch'], 'cx': [ diff --git a/patches/components/shared/layout/layout_node.rs.patch b/patches/components/shared/layout/layout_node.rs.patch index 4cb7474..3b7118a 100644 --- a/patches/components/shared/layout/layout_node.rs.patch +++ b/patches/components/shared/layout/layout_node.rs.patch @@ -1,6 +1,6 @@ --- original +++ modified -@@ -201,6 +201,12 @@ +@@ -208,6 +208,12 @@ /// not an iframe element, fails. Returns None if there is no nested browsing context. fn iframe_pipeline_id(&self) -> Option;