From de476ff27d1a9baa9bb47faee7f2714b94b40213 Mon Sep 17 00:00:00 2001 From: webbeef Date: Thu, 12 Feb 2026 22:50:53 -0800 Subject: [PATCH] chore: update to Servo 3be015e09f028c5ffd4b81bd8cccac2ef77bc0db --- Cargo.lock | 210 +++++++++--------- Cargo.toml | 18 +- forkme.lock | 2 +- .../constellation/constellation.rs.patch | 4 +- patches/components/layout/replaced.rs.patch | 2 +- patches/components/paint/paint.rs.patch | 12 +- patches/components/paint/painter.rs.patch | 45 ++-- patches/components/paint/tracing.rs.patch | 4 +- .../components/script/dom/document.rs.patch | 6 +- .../components/script/dom/keyboard.rs.patch | 7 +- .../components/script/script_thread.rs.patch | 14 +- patches/components/servo/servo.rs.patch | 2 +- .../shared/constellation/lib.rs.patch | 4 +- patches/components/shared/paint/lib.rs.patch | 8 +- patches/components/shared/script/lib.rs.patch | 4 +- 15 files changed, 176 insertions(+), 166 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26eb7b8..7213d8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -290,7 +290,7 @@ dependencies = [ "objc2-foundation 0.3.2", "parking_lot", "percent-encoding", - "windows-sys 0.52.0", + "windows-sys 0.60.2", "x11rb", ] @@ -302,7 +302,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -376,7 +376,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -476,9 +476,9 @@ dependencies = [ [[package]] name = "avif-serialize" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c8fbc0f831f4519fe8b810b6a7a91410ec83031b8233f730a0480029f6a23f" +checksum = "375082f007bd67184fb9c0374614b29f9aaa604ec301635f72338bb65386a53d" dependencies = [ "arrayvec", ] @@ -495,9 +495,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.37.0" +version = "0.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c34dda4df7017c8db52132f0f8a2e0f8161649d15723ed63fc00c82d0f2081a" +checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549" dependencies = [ "cc", "cmake", @@ -674,7 +674,7 @@ dependencies = [ "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -941,7 +941,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1255,18 +1255,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.57" +version = "4.5.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a" +checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.57" +version = "4.5.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238" +checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2" dependencies = [ "anstyle", "clap_lex", @@ -1274,9 +1274,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" +checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" [[package]] name = "clipboard-win" @@ -1730,7 +1730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1771,7 +1771,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1794,7 +1794,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1805,7 +1805,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1834,7 +1834,7 @@ dependencies = [ name = "deny_public_fields" version = "0.1.0" dependencies = [ - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -1858,14 +1858,14 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] name = "deranged" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4" dependencies = [ "powerfmt", "serde_core", @@ -1889,7 +1889,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1909,6 +1909,7 @@ dependencies = [ "malloc_size_of_derive", "net", "net_traits", + "profile_traits", "rand 0.9.2", "rustc-hash 2.1.1", "serde", @@ -1930,6 +1931,7 @@ dependencies = [ "log", "malloc_size_of_derive", "net_traits", + "profile_traits", "serde", "servo_malloc_size_of", "servo_url", @@ -1957,7 +1959,7 @@ dependencies = [ "diplomat_core", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1978,7 +1980,7 @@ dependencies = [ "serde", "smallvec", "strck_ident", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1999,7 +2001,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2026,7 +2028,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2053,7 +2055,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2225,7 +2227,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2268,7 +2270,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2284,7 +2286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2364,7 +2366,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2620,7 +2622,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2744,7 +2746,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2993,7 +2995,7 @@ dependencies = [ "gobject-sys 0.21.5", "libc", "system-deps 7.0.7", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3071,7 +3073,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3084,7 +3086,7 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3631,7 +3633,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4015,7 +4017,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.2", "tokio", "tower-service", "tracing", @@ -4508,7 +4510,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4658,7 +4660,7 @@ checksum = "c727f80bfa4a6c6e2508d2f05b6f4bfce242030bd88ed15ae5331c5b5d30fba7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4679,7 +4681,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4715,7 +4717,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4787,7 +4789,7 @@ checksum = "ff7a39c8862fc1369215ccf0a8f12dd4598c7f6484704359f0351bd617034dbf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4837,7 +4839,7 @@ name = "jstraceable_derive" version = "0.1.0" dependencies = [ "proc-macro2", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -5324,7 +5326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f44db74bde26fdf427af23f1d146c211aed857c59e3be750cf2617f6b0b05c94" dependencies = [ "proc-macro2", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -5544,9 +5546,9 @@ dependencies = [ [[package]] name = "mozjs" -version = "0.14.8" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f3329b0f19f40511bd7266d68ffbedf6d3d59157451927ec8d58ea010f6cda" +checksum = "af2c1ff3ebff6f4276c66c82af601ad97a2fe9a2e9e0b5b43a38843c929046af" dependencies = [ "bindgen", "cc", @@ -5834,7 +5836,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5888,7 +5890,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5961,7 +5963,7 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6648,7 +6650,7 @@ checksum = "271f78bae1e699b58c180a384a2e8d78ccbb60b853e15db92339725f3a2764d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -6731,7 +6733,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6766,7 +6768,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7002,7 +7004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7127,7 +7129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" dependencies = [ "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7150,7 +7152,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7659,7 +7661,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -7716,7 +7718,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -8048,7 +8050,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "thiserror 2.0.18", ] @@ -8102,7 +8104,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.35.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "bitflags 2.10.0", "cssparser", @@ -8162,7 +8164,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -8268,7 +8270,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -8399,7 +8401,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -8418,7 +8420,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.3" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "serde", "stable_deref_trait", @@ -8441,7 +8443,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -8851,13 +8853,13 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] name = "stylo" version = "0.12.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "app_units", "arrayvec", @@ -8914,7 +8916,7 @@ dependencies = [ [[package]] name = "stylo_atoms" version = "0.12.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "string_cache", "string_cache_codegen", @@ -8923,24 +8925,24 @@ dependencies = [ [[package]] name = "stylo_config" version = "0.12.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" [[package]] name = "stylo_derive" version = "0.12.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] [[package]] name = "stylo_dom" version = "0.12.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "bitflags 2.10.0", "stylo_malloc_size_of", @@ -8949,7 +8951,7 @@ dependencies = [ [[package]] name = "stylo_malloc_size_of" version = "0.12.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "app_units", "cssparser", @@ -8966,7 +8968,7 @@ dependencies = [ [[package]] name = "stylo_static_prefs" version = "0.12.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "stylo_config", ] @@ -8974,7 +8976,7 @@ dependencies = [ [[package]] name = "stylo_traits" version = "0.12.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "app_units", "bitflags 2.10.0", @@ -9062,9 +9064,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.114" +version = "2.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "6e614ed320ac28113fa64972c4262d5dbc89deacdfd00c34a3e4cea073243c12" dependencies = [ "proc-macro2", "quote", @@ -9085,7 +9087,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -9159,7 +9161,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix 1.1.3", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -9224,7 +9226,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -9235,7 +9237,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -9407,7 +9409,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.3.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "cssparser", "servo_arc", @@ -9420,12 +9422,12 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?rev=d9831d464bd254e2d71e2ec58c78feaa85fb2a27#d9831d464bd254e2d71e2ec58c78feaa85fb2a27" +source = "git+https://github.com/servo/stylo?rev=1f465de23efeb8ad7e981b2d36638263e13f16bb#1f465de23efeb8ad7e981b2d36638263e13f16bb" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -9452,7 +9454,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -9666,7 +9668,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -10246,7 +10248,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "wasm-bindgen-shared", ] @@ -10627,8 +10629,10 @@ dependencies = [ "euclid", "ipc-channel", "log", + "malloc_size_of_derive", "profile_traits", "serde", + "servo_malloc_size_of", ] [[package]] @@ -10810,7 +10814,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -10909,7 +10913,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -10920,7 +10924,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -10931,7 +10935,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -10942,7 +10946,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -11371,7 +11375,7 @@ dependencies = [ "heck 0.5.0", "indexmap", "prettyplease", - "syn 2.0.114", + "syn 2.0.115", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -11387,7 +11391,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -11667,7 +11671,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -11679,7 +11683,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -11712,7 +11716,7 @@ checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -11732,7 +11736,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -11753,7 +11757,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -11808,7 +11812,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -11819,7 +11823,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 967fa2e..dde2d75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,7 +105,7 @@ imsz = "0.4" indexmap = { version = "2.11.4", features = ["std"] } ipc-channel = "0.21" itertools = "0.14" -js = { package = "mozjs", version = "=0.14.8", default-features = false, features = ["libz-sys", "intl"] } +js = { package = "mozjs", version = "=0.15.0", default-features = false, features = ["libz-sys", "intl"] } keyboard-types = { version = "0.8.3", features = ["serde", "webdriver"] } kurbo = { version = "0.12", features = ["euclid"] } layout_api = { path = "source/components/shared/layout" } @@ -163,7 +163,7 @@ script_traits = { path = "source/components/shared/script" } sea-query = { version = "1.0.0-rc.30", default-features = false, features = ["backend-sqlite", "derive"] } sea-query-rusqlite = { version = "0.8.0-rc.15" } sec1 = "0.7" -selectors = { git = "https://github.com/servo/stylo", rev = "d9831d464bd254e2d71e2ec58c78feaa85fb2a27" } +selectors = { git = "https://github.com/servo/stylo", rev = "1f465de23efeb8ad7e981b2d36638263e13f16bb" } serde = "1.0.228" serde_bytes = "0.11" serde_core = "1.0.226" @@ -172,7 +172,7 @@ servo-media = { path = "source/components/media/servo-media" } servo-media-dummy = { path = "source/components/media/backends/dummy" } servo-media-gstreamer = { path = "source/components/media/backends/gstreamer" } servo-tracing = { path = "source/components/servo_tracing" } -servo_arc = { git = "https://github.com/servo/stylo", rev = "d9831d464bd254e2d71e2ec58c78feaa85fb2a27" } +servo_arc = { git = "https://github.com/servo/stylo", rev = "1f465de23efeb8ad7e981b2d36638263e13f16bb" } sha1 = "0.10" sha2 = "0.10" sha3 = "0.10" @@ -181,12 +181,12 @@ smallvec = { version = "1.15", features = ["serde", "union"] } 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 = "d9831d464bd254e2d71e2ec58c78feaa85fb2a27" } -stylo_atoms = { git = "https://github.com/servo/stylo", rev = "d9831d464bd254e2d71e2ec58c78feaa85fb2a27" } -stylo_config = { git = "https://github.com/servo/stylo", rev = "d9831d464bd254e2d71e2ec58c78feaa85fb2a27" } -stylo_dom = { git = "https://github.com/servo/stylo", rev = "d9831d464bd254e2d71e2ec58c78feaa85fb2a27" } -stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "d9831d464bd254e2d71e2ec58c78feaa85fb2a27" } -stylo_traits = { git = "https://github.com/servo/stylo", rev = "d9831d464bd254e2d71e2ec58c78feaa85fb2a27" } +stylo = { git = "https://github.com/servo/stylo", rev = "1f465de23efeb8ad7e981b2d36638263e13f16bb" } +stylo_atoms = { git = "https://github.com/servo/stylo", rev = "1f465de23efeb8ad7e981b2d36638263e13f16bb" } +stylo_config = { git = "https://github.com/servo/stylo", rev = "1f465de23efeb8ad7e981b2d36638263e13f16bb" } +stylo_dom = { git = "https://github.com/servo/stylo", rev = "1f465de23efeb8ad7e981b2d36638263e13f16bb" } +stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "1f465de23efeb8ad7e981b2d36638263e13f16bb" } +stylo_traits = { git = "https://github.com/servo/stylo", rev = "1f465de23efeb8ad7e981b2d36638263e13f16bb" } surfman = { version = "0.11.0", features = ["chains"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } synstructure = "0.13" diff --git a/forkme.lock b/forkme.lock index 818054e..7e949ee 100644 --- a/forkme.lock +++ b/forkme.lock @@ -1 +1 @@ -b76354f058b38af89ee8e53e0a30ffbe3ae62f87 +3be015e09f028c5ffd4b81bd8cccac2ef77bc0db diff --git a/patches/components/constellation/constellation.rs.patch b/patches/components/constellation/constellation.rs.patch index b200cda..2974532 100644 --- a/patches/components/constellation/constellation.rs.patch +++ b/patches/components/constellation/constellation.rs.patch @@ -716,7 +716,7 @@ #[servo_tracing::instrument(skip_all)] fn handle_refresh_cursor(&self, pipeline_id: PipelineId) { let Some(pipeline) = self.pipelines.get(&pipeline_id) else { -@@ -4634,7 +5214,7 @@ +@@ -4638,7 +5218,7 @@ } #[servo_tracing::instrument(skip_all)] @@ -725,7 +725,7 @@ // Send a flat projection of the history to embedder. // The final vector is a concatenation of the URLs of the past // entries, the current entry and the future entries. -@@ -4737,9 +5317,23 @@ +@@ -4741,9 +5321,23 @@ ); self.embedder_proxy.send(EmbedderMsg::HistoryChanged( webview_id, diff --git a/patches/components/layout/replaced.rs.patch b/patches/components/layout/replaced.rs.patch index 8480eaa..c36db58 100644 --- a/patches/components/layout/replaced.rs.patch +++ b/patches/components/layout/replaced.rs.patch @@ -1,6 +1,6 @@ --- original +++ modified -@@ -523,6 +523,7 @@ +@@ -520,6 +520,7 @@ viewport_details: ViewportDetails { size, hidpi_scale_factor: Scale::new(hidpi_scale_factor.0), diff --git a/patches/components/paint/paint.rs.patch b/patches/components/paint/paint.rs.patch index 2471b4e..fd9c388 100644 --- a/patches/components/paint/paint.rs.patch +++ b/patches/components/paint/paint.rs.patch @@ -48,8 +48,8 @@ })) } -@@ -539,6 +546,92 @@ - painter.append_lcp_candidate(lcp_candidate, webview_id, pipeline_id, epoch); +@@ -544,6 +551,92 @@ + painter.enable_lcp_calculation(&webview_id); } }, + PaintMessage::UpdateEmbeddedWebViewRect { @@ -141,7 +141,7 @@ } } -@@ -596,6 +689,152 @@ +@@ -601,6 +694,152 @@ sender.send(ProcessReports::new(reports)); } @@ -294,7 +294,7 @@ /// Handle messages sent to `Paint` during the shutdown process. In general, /// the things `Paint` can do in this state are limited. It's very important to /// answer any synchronous messages though as other threads might be waiting on the -@@ -740,10 +979,37 @@ +@@ -745,10 +984,37 @@ #[cfg(feature = "webxr")] self.webxr_main_thread.borrow_mut().run_one_frame(); @@ -333,7 +333,7 @@ self.shutdown_state() != ShutdownState::FinishedShuttingDown } -@@ -783,6 +1049,10 @@ +@@ -788,6 +1054,10 @@ if self.shutdown_state() != ShutdownState::NotShuttingDown { return; } @@ -344,7 +344,7 @@ self.painter_mut(webview_id.into()) .notify_input_event(webview_id, event); } -@@ -791,6 +1061,53 @@ +@@ -796,6 +1066,53 @@ if self.shutdown_state() != ShutdownState::NotShuttingDown { return; } diff --git a/patches/components/paint/painter.rs.patch b/patches/components/paint/painter.rs.patch index 43862ce..b6d0789 100644 --- a/patches/components/paint/painter.rs.patch +++ b/patches/components/paint/painter.rs.patch @@ -8,7 +8,7 @@ use std::collections::hash_map::Entry; use std::rc::Rc; use std::sync::Arc; -@@ -80,8 +81,15 @@ +@@ -80,7 +81,14 @@ pub(crate) painter_id: PainterId, /// Our [`WebViewRenderer`]s, one for every `WebView`. @@ -16,15 +16,14 @@ + /// Using BTreeMap to ensure deterministic iteration order by WebViewId, + /// which is important for proper z-ordering in the display list (parents before children). + pub(crate) webview_renderers: BTreeMap, - ++ + /// Set of WebViewIds that are embedded webviews. These should not be rendered + /// as top-level iframes in the root display list, as they are already referenced + /// by their parent's display list through IFrameFragment. + pub(crate) embedded_webview_ids: FxHashSet, -+ + /// Tracks whether or not the view needs to be repainted. pub(crate) needs_repaint: Cell, - @@ -258,6 +266,7 @@ painter_id, embedder_to_constellation_sender, @@ -81,7 +80,7 @@ } #[track_caller] -@@ -591,7 +610,16 @@ +@@ -589,7 +608,16 @@ let root_clip_id = builder.define_clip_rect(root_reference_frame, viewport_rect); let clip_chain_id = builder.define_clip_chain(None, [root_clip_id]); @@ -98,7 +97,7 @@ if webview_renderer.hidden() { continue; } -@@ -652,7 +680,7 @@ +@@ -650,7 +678,7 @@ /// Set the root pipeline for our WebRender scene to a display list that consists of an iframe /// for each visible top-level browsing context, applying a transformation on the root for /// pinch zoom, page zoom, and HiDPI scaling. @@ -107,7 +106,7 @@ let mut transaction = Transaction::new(); self.send_root_pipeline_display_list_in_transaction(&mut transaction); self.generate_frame(&mut transaction, RenderReasons::SCENE); -@@ -718,6 +746,21 @@ +@@ -716,6 +744,21 @@ self.send_transaction(transaction); } @@ -129,7 +128,7 @@ pub(crate) fn toggle_webrender_debug(&mut self, option: WebRenderDebugOption) { let Some(renderer) = self.webrender_renderer.as_mut() else { return; -@@ -788,6 +831,26 @@ +@@ -786,6 +829,26 @@ self.send_root_pipeline_display_list(); } @@ -156,7 +155,7 @@ pub(crate) fn set_throttled( &mut self, webview_id: WebViewId, -@@ -1181,15 +1244,23 @@ +@@ -1179,15 +1242,23 @@ webview: Box, viewport_details: ViewportDetails, ) { @@ -184,7 +183,7 @@ } pub(crate) fn remove_webview(&mut self, webview_id: WebViewId) { -@@ -1276,25 +1347,26 @@ +@@ -1274,28 +1345,29 @@ } pub(crate) fn notify_input_event(&mut self, webview_id: WebViewId, event: InputEventAndId) { @@ -202,10 +201,11 @@ - InputEvent::MouseLeftViewport(_) => { - self.last_mouse_move_position = None; - }, -- _ => {}, +- _ => { +- // Disable LCP calculation on any other input event except mouse moves. +- self.lcp_calculator.disable_for_webview(webview_id); +- }, - } -- -- webview_renderer.notify_input_event(&self.webrender_api, &self.needs_repaint, event); + let Some(webview_renderer) = self.webview_renderers.get_mut(&webview_id) else { + return; + }; @@ -222,15 +222,20 @@ + InputEvent::MouseLeftViewport(_) => { + self.last_mouse_move_position = None; + }, -+ _ => {}, - } -+ ++ _ => { ++ // Disable LCP calculation on any other input event except mouse moves. ++ self.lcp_calculator.disable_for_webview(webview_id); ++ }, ++ } + +- webview_renderer.notify_input_event(&self.webrender_api, &self.needs_repaint, event); +- } + webview_renderer.notify_input_event(&self.webrender_api, &self.needs_repaint, event); - self.disable_lcp_calculation_for_webview(webview_id); } -@@ -1310,6 +1382,38 @@ - self.disable_lcp_calculation_for_webview(webview_id); + pub(crate) fn notify_scroll_event( +@@ -1319,6 +1391,38 @@ + self.lcp_calculator.enabled_for_webview(webview_id) } + /// Attempt to scroll at the given point. Returns true if scroll was consumed. @@ -268,7 +273,7 @@ pub(crate) fn pinch_zoom( &mut self, webview_id: WebViewId, -@@ -1356,7 +1460,6 @@ +@@ -1365,7 +1469,6 @@ result: InputEventResult, ) { let Some(webview_renderer) = self.webview_renderers.get_mut(&webview_id) else { diff --git a/patches/components/paint/tracing.rs.patch b/patches/components/paint/tracing.rs.patch index 7cae63a..1192b42 100644 --- a/patches/components/paint/tracing.rs.patch +++ b/patches/components/paint/tracing.rs.patch @@ -1,9 +1,9 @@ --- original +++ modified -@@ -54,6 +54,14 @@ - Self::DelayNewFrameForCanvas(..) => target!("DelayFramesForCanvas"), +@@ -55,6 +55,14 @@ Self::ScreenshotReadinessReponse(..) => target!("ScreenshotReadinessResponse"), Self::SendLCPCandidate(..) => target!("SendLCPCandidate"), + Self::EnableLCPCalculation(..) => target!("EnableLCPCalculation"), + Self::UpdateEmbeddedWebViewRect { .. } => target!("UpdateEmbeddedWebViewRect"), + Self::RemoveEmbeddedWebView(..) => target!("RemoveEmbeddedWebView"), + Self::SetEmbeddedWebViewHidden { .. } => target!("SetEmbeddedWebViewHidden"), diff --git a/patches/components/script/dom/document.rs.patch b/patches/components/script/dom/document.rs.patch index 0486849..8efbe0a 100644 --- a/patches/components/script/dom/document.rs.patch +++ b/patches/components/script/dom/document.rs.patch @@ -215,9 +215,9 @@ self.send_to_embedder(EmbedderMsg::NewFavicon(self.webview_id(), image.clone())); } } -@@ -5014,6 +5132,20 @@ - *self.favicon.borrow_mut() = Some(favicon); - self.notify_embedder_favicon(); +@@ -5018,6 +5136,20 @@ + pub(crate) fn fullscreen_element(&self) -> Option> { + self.fullscreen_element.get() } + + pub(crate) fn notify_embedder_theme_color(&self) { diff --git a/patches/components/script/dom/keyboard.rs.patch b/patches/components/script/dom/keyboard.rs.patch index 0c8d439..21f68a5 100644 --- a/patches/components/script/dom/keyboard.rs.patch +++ b/patches/components/script/dom/keyboard.rs.patch @@ -1,6 +1,6 @@ --- original +++ modified -@@ -0,0 +1,174 @@ +@@ -0,0 +1,175 @@ +/* SPDX Id: AGPL-3.0-or-later */ + +//! The `Keyboard` interface provides virtual keyboard input injection. @@ -14,6 +14,7 @@ +use keyboard_types::{ + Code, CompositionEvent, CompositionState, Key, KeyState, Location, Modifiers, +}; ++use script_bindings::cformat; + +use crate::dom::bindings::codegen::Bindings::KeyboardBinding::{ + KeyboardMethods, ServoCompositionEventInit, ServoKeyboardEventInit, @@ -53,7 +54,7 @@ + match &*state.str() { + "down" => Ok(KeyState::Down), + "up" => Ok(KeyState::Up), -+ _ => Err(Error::Type(format!( ++ _ => Err(Error::Type(cformat!( + "Invalid key state '{}': expected 'down' or 'up'", + state + ))), @@ -129,7 +130,7 @@ + "start" => Ok(CompositionState::Start), + "update" => Ok(CompositionState::Update), + "end" => Ok(CompositionState::End), -+ _ => Err(Error::Type(format!( ++ _ => Err(Error::Type(cformat!( + "Invalid composition state '{}': expected 'start', 'update', or 'end'", + state + ))), diff --git a/patches/components/script/script_thread.rs.patch b/patches/components/script/script_thread.rs.patch index da076fe..dffcbde 100644 --- a/patches/components/script/script_thread.rs.patch +++ b/patches/components/script/script_thread.rs.patch @@ -76,7 +76,7 @@ } } -@@ -2929,6 +2951,9 @@ +@@ -2932,6 +2954,9 @@ .documents .borrow() .find_iframe(parent_pipeline_id, browsing_context_id); @@ -86,7 +86,7 @@ if let Some(frame_element) = frame_element { frame_element.update_pipeline_id(new_pipeline_id, reason, can_gc); } -@@ -2947,6 +2972,7 @@ +@@ -2950,6 +2975,7 @@ // is no need to pass along existing opener information that // will be discarded. None, @@ -94,7 +94,7 @@ ); } } -@@ -3226,6 +3252,44 @@ +@@ -3229,6 +3255,44 @@ } } @@ -139,7 +139,7 @@ fn ask_constellation_for_top_level_info( &self, sender_webview_id: WebViewId, -@@ -3338,7 +3402,13 @@ +@@ -3341,7 +3405,13 @@ self.senders.pipeline_to_embedder_sender.clone(), self.senders.constellation_sender.clone(), incomplete.pipeline_id, @@ -154,7 +154,7 @@ incomplete.viewport_details, origin.clone(), final_url.clone(), -@@ -3360,6 +3430,8 @@ +@@ -3363,6 +3433,8 @@ #[cfg(feature = "webgpu")] self.gpu_id_hub.clone(), incomplete.load_data.inherited_secure_context, @@ -163,7 +163,7 @@ incomplete.theme, self.this.clone(), ); -@@ -3381,6 +3453,7 @@ +@@ -3384,6 +3456,7 @@ incomplete.webview_id, incomplete.parent_info, incomplete.opener, @@ -171,7 +171,7 @@ ); if window_proxy.parent().is_some() { // https://html.spec.whatwg.org/multipage/#navigating-across-documents:delaying-load-events-mode-2 -@@ -4088,6 +4161,24 @@ +@@ -4091,6 +4164,24 @@ document.event_handler().handle_refresh_cursor(); } diff --git a/patches/components/servo/servo.rs.patch b/patches/components/servo/servo.rs.patch index 2ba1c68..70c264c 100644 --- a/patches/components/servo/servo.rs.patch +++ b/patches/components/servo/servo.rs.patch @@ -133,7 +133,7 @@ } } } -@@ -928,6 +998,14 @@ +@@ -929,6 +999,14 @@ self.0.site_data_manager.borrow() } diff --git a/patches/components/shared/constellation/lib.rs.patch b/patches/components/shared/constellation/lib.rs.patch index fc61988..b38fbd9 100644 --- a/patches/components/shared/constellation/lib.rs.patch +++ b/patches/components/shared/constellation/lib.rs.patch @@ -21,7 +21,7 @@ }; pub use from_script_message::*; use malloc_size_of_derive::MallocSizeOf; -@@ -37,9 +38,70 @@ +@@ -36,9 +37,70 @@ use servo_url::{ImmutableOrigin, ServoUrl}; pub use structured_data::*; use strum::IntoStaticStr; @@ -93,7 +93,7 @@ /// Messages to the Constellation from the embedding layer, whether from `ServoRenderer` or /// from `libservo` itself. #[derive(IntoStaticStr)] -@@ -117,6 +179,9 @@ +@@ -116,6 +178,9 @@ UserContentManagerAction(UserContentManagerId, UserContentManagerAction), /// Update pinch zoom details stored in the top level window UpdatePinchZoomInfos(PipelineId, PinchZoomInfos), diff --git a/patches/components/shared/paint/lib.rs.patch b/patches/components/shared/paint/lib.rs.patch index 49402b0..8bd433e 100644 --- a/patches/components/shared/paint/lib.rs.patch +++ b/patches/components/shared/paint/lib.rs.patch @@ -18,10 +18,10 @@ use webrender_api::{ BuiltDisplayList, BuiltDisplayListDescriptor, ExternalImage, ExternalImageData, ExternalImageHandler, ExternalImageId, ExternalScrollId, FontInstanceFlags, FontInstanceKey, -@@ -187,6 +187,45 @@ - ScreenshotReadinessReponse(WebViewId, FxHashMap), - /// The candidate of largest-contentful-paint +@@ -189,6 +189,45 @@ SendLCPCandidate(LCPCandidate, WebViewId, PipelineId, Epoch), + /// Enable LCP calculation for the given WebView. + EnableLCPCalculation(WebViewId), + /// Update the position and size of an embedded webview within its parent webview. + /// Used for routing input events to embedded webviews. + UpdateEmbeddedWebViewRect { @@ -64,7 +64,7 @@ } impl Debug for PaintMessage { -@@ -540,6 +579,65 @@ +@@ -542,6 +581,65 @@ source, )); } diff --git a/patches/components/shared/script/lib.rs.patch b/patches/components/shared/script/lib.rs.patch index 789f179..e5a9e45 100644 --- a/patches/components/shared/script/lib.rs.patch +++ b/patches/components/shared/script/lib.rs.patch @@ -20,7 +20,7 @@ }; use euclid::{Scale, Size2D}; use fonts_traits::SystemFontServiceProxySender; -@@ -78,6 +78,14 @@ +@@ -77,6 +77,14 @@ pub user_content_manager_id: Option, /// The [`Theme`] of the new layout. pub theme: Theme, @@ -35,7 +35,7 @@ } /// When a pipeline is closed, should its browsing context be discarded too? -@@ -309,6 +317,19 @@ +@@ -306,6 +314,19 @@ /// Update the pinch zoom details of a pipeline. Each `Window` stores a `VisualViewport` DOM /// instance that gets updated according to the changes from the `Compositor``. UpdatePinchZoomInfos(PipelineId, PinchZoomInfos), -- 2.51.2