From a976b769dea6570b5148d7f570ec06eac887309f Mon Sep 17 00:00:00 2001 From: webbeef Date: Fri, 30 Jan 2026 09:19:37 -0800 Subject: [PATCH] chore: update to servo 34c644d5b85b98332bebfb948707bb6dc0b524ab --- Cargo.lock | 126 ++++++++----------- Cargo.toml | 17 +-- forkme.lock | 1 + patches/components/paint/Cargo.toml.patch | 2 +- patches/components/paint/paint.rs.patch | 10 +- patches/components/paint/painter.rs.patch | 24 ++-- patches/components/shared/paint/lib.rs.patch | 6 +- 7 files changed, 86 insertions(+), 100 deletions(-) create mode 100644 forkme.lock diff --git a/Cargo.lock b/Cargo.lock index 13437fb..4f5aaaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1283,6 +1283,15 @@ dependencies = [ "cc", ] +[[package]] +name = "cobs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +dependencies = [ + "thiserror 2.0.18", +] + [[package]] name = "codespan-reporting" version = "0.12.0" @@ -2128,6 +2137,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "embedder_traits" version = "0.1.0" @@ -4013,7 +4034,7 @@ dependencies = [ "icu_properties 1.5.1", "icu_provider 1.5.0", "icu_provider_adapters", - "icu_segmenter 1.5.0", + "icu_segmenter", "icu_timezone", "tinystr 0.7.6", "unicode-bidi", @@ -4197,21 +4218,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52b1a7fbdbf3958f1be8354cb59ac73f165b7b7082d447ff2090355c9a069120" -[[package]] -name = "icu_locale" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60" -dependencies = [ - "icu_collections 2.1.1", - "icu_locale_core", - "icu_locale_data", - "icu_provider 2.1.1", - "potential_utf", - "tinystr 0.8.2", - "zerovec 0.11.5", -] - [[package]] name = "icu_locale_core" version = "2.1.1" @@ -4220,18 +4226,11 @@ checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap 0.8.1", - "serde", "tinystr 0.8.2", "writeable 0.6.2", "zerovec 0.11.5", ] -[[package]] -name = "icu_locale_data" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831" - [[package]] name = "icu_locid" version = "1.5.0" @@ -4409,8 +4408,6 @@ checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "serde", - "stable_deref_trait", "writeable 0.6.2", "yoke 0.8.1", "zerofrom", @@ -4453,39 +4450,17 @@ dependencies = [ "icu_collections 1.5.0", "icu_locid", "icu_provider 1.5.0", - "icu_segmenter_data 1.5.1", + "icu_segmenter_data", "utf8_iter", "zerovec 0.10.4", ] -[[package]] -name = "icu_segmenter" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a807a7488f3f758629ae86d99d9d30dce24da2fb2945d74c80a4f4a62c71db73" -dependencies = [ - "core_maths", - "icu_collections 2.1.1", - "icu_locale", - "icu_provider 2.1.1", - "icu_segmenter_data 2.1.1", - "potential_utf", - "utf8_iter", - "zerovec 0.11.5", -] - [[package]] name = "icu_segmenter_data" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1e52775179941363cc594e49ce99284d13d6948928d8e72c755f55e98caa1eb" -[[package]] -name = "icu_segmenter_data" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ebbb7321d9e21d25f5660366cb6c08201d0175898a3a6f7a41ee9685af21c80" - [[package]] name = "icu_timezone" version = "1.5.0" @@ -4892,7 +4867,7 @@ dependencies = [ "fonts_traits", "html5ever", "icu_locid", - "icu_segmenter 1.5.0", + "icu_segmenter", "itertools 0.14.0", "kurbo 0.12.0", "layout_api", @@ -6384,7 +6359,6 @@ name = "paint" version = "0.1.0" dependencies = [ "base", - "bincode", "bitflags 2.10.0", "canvas_traits", "constellation_traits", @@ -6426,7 +6400,6 @@ name = "paint_api" version = "0.1.0" dependencies = [ "base", - "bincode", "bitflags 2.10.0", "crossbeam-channel", "dpi", @@ -6444,6 +6417,8 @@ dependencies = [ "raw-window-handle", "rustc-hash 2.1.1", "serde", + "serde_bytes", + "servo-tracing", "servo_geometry", "servo_malloc_size_of", "smallvec", @@ -6451,6 +6426,7 @@ dependencies = [ "stylo", "stylo_traits", "surfman", + "tracing", "webrender_api", ] @@ -6848,14 +6824,24 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "postcard" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24" +dependencies = [ + "cobs", + "embedded-io 0.4.0", + "embedded-io 0.6.1", + "serde", +] + [[package]] name = "potential_utf" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ - "serde_core", - "writeable 0.6.2", "zerovec 0.11.5", ] @@ -7649,7 +7635,6 @@ dependencies = [ "base", "base64 0.22.1", "base64ct", - "bincode", "bitflags 2.10.0", "bluetooth_traits", "brotli", @@ -7721,6 +7706,7 @@ dependencies = [ "phf", "pixels", "pkcs8", + "postcard", "profile_traits", "rand 0.9.2", "regex", @@ -7937,7 +7923,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.35.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "bitflags 2.10.0", "cssparser", @@ -8253,7 +8239,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.3" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "serde", "stable_deref_trait", @@ -8579,11 +8565,11 @@ name = "storage" version = "0.1.0" dependencies = [ "base", - "bincode", "libc", "log", "malloc_size_of_derive", "net_traits", + "postcard", "profile", "profile_traits", "rusqlite", @@ -8692,7 +8678,7 @@ dependencies = [ [[package]] name = "stylo" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "app_units", "arrayvec", @@ -8703,7 +8689,7 @@ dependencies = [ "derive_more", "encoding_rs", "euclid", - "icu_segmenter 2.1.2", + "icu_segmenter", "indexmap", "itertools 0.14.0", "itoa", @@ -8747,7 +8733,7 @@ dependencies = [ [[package]] name = "stylo_atoms" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "string_cache", "string_cache_codegen", @@ -8756,12 +8742,12 @@ dependencies = [ [[package]] name = "stylo_config" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" [[package]] name = "stylo_derive" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "darling", "proc-macro2", @@ -8773,7 +8759,7 @@ dependencies = [ [[package]] name = "stylo_dom" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "bitflags 2.10.0", "stylo_malloc_size_of", @@ -8782,7 +8768,7 @@ dependencies = [ [[package]] name = "stylo_malloc_size_of" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "app_units", "cssparser", @@ -8799,12 +8785,12 @@ dependencies = [ [[package]] name = "stylo_static_prefs" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" [[package]] name = "stylo_traits" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "app_units", "bitflags 2.10.0", @@ -9196,7 +9182,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", - "serde_core", "zerovec 0.11.5", ] @@ -9228,7 +9213,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.3.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "cssparser", "servo_arc", @@ -9241,7 +9226,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?rev=29123c1295b527ff5230afc2bcff53138cd884b5#29123c1295b527ff5230afc2bcff53138cd884b5" +source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" dependencies = [ "darling", "proc-macro2", @@ -10209,7 +10194,7 @@ dependencies = [ "bytes", "cookie 0.16.2", "http 0.2.12", - "icu_segmenter 1.5.0", + "icu_segmenter", "log", "serde", "serde_derive", @@ -11477,7 +11462,6 @@ version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ - "serde", "yoke 0.8.1", "zerofrom", "zerovec-derive 0.11.2", diff --git a/Cargo.toml b/Cargo.toml index fead21b..97fb02a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -129,6 +129,7 @@ parking_lot = { version = "0.12", features = ["serde"] } peniko = "0.5" percent-encoding = "2.3" pkcs8 = { version = "0.10", features = ["rand_core"] } +postcard = { version = "1.1.3", default-features = false, features = ["use-std"] } proc-macro2 = "1" profile_traits = { path = "source/components/shared/profile" } quote = "1" @@ -147,7 +148,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 = "29123c1295b527ff5230afc2bcff53138cd884b5" } +selectors = { git = "https://github.com/servo/stylo", rev = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } serde = "1.0.228" serde_bytes = "0.11" serde_core = "1.0.226" @@ -156,7 +157,7 @@ servo-media = { git = "https://github.com/servo/media", rev = "f384dbc4ff8b5c6f8 servo-media-dummy = { git = "https://github.com/servo/media", rev = "f384dbc4ff8b5c6f8db2c763306cbe2281d66391" } servo-media-gstreamer = { git = "https://github.com/servo/media", rev = "f384dbc4ff8b5c6f8db2c763306cbe2281d66391" } servo-tracing = { path = "source/components/servo_tracing" } -servo_arc = { git = "https://github.com/servo/stylo", rev = "29123c1295b527ff5230afc2bcff53138cd884b5" } +servo_arc = { git = "https://github.com/servo/stylo", rev = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } sha1 = "0.10" sha2 = "0.10" sha3 = "0.10" @@ -165,12 +166,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 = "29123c1295b527ff5230afc2bcff53138cd884b5" } -stylo_atoms = { git = "https://github.com/servo/stylo", rev = "29123c1295b527ff5230afc2bcff53138cd884b5" } -stylo_config = { git = "https://github.com/servo/stylo", rev = "29123c1295b527ff5230afc2bcff53138cd884b5" } -stylo_dom = { git = "https://github.com/servo/stylo", rev = "29123c1295b527ff5230afc2bcff53138cd884b5" } -stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "29123c1295b527ff5230afc2bcff53138cd884b5" } -stylo_traits = { git = "https://github.com/servo/stylo", rev = "29123c1295b527ff5230afc2bcff53138cd884b5" } +stylo = { git = "https://github.com/servo/stylo", rev = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } +stylo_atoms = { git = "https://github.com/servo/stylo", rev = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } +stylo_config = { git = "https://github.com/servo/stylo", rev = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } +stylo_dom = { git = "https://github.com/servo/stylo", rev = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } +stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } +stylo_traits = { git = "https://github.com/servo/stylo", rev = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } 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 new file mode 100644 index 0000000..bce1cce --- /dev/null +++ b/forkme.lock @@ -0,0 +1 @@ +34c644d5b85b98332bebfb948707bb6dc0b524ab diff --git a/patches/components/paint/Cargo.toml.patch b/patches/components/paint/Cargo.toml.patch index a296849..5f21d31 100644 --- a/patches/components/paint/Cargo.toml.patch +++ b/patches/components/paint/Cargo.toml.patch @@ -1,6 +1,6 @@ --- original +++ modified -@@ -38,6 +38,7 @@ +@@ -37,6 +37,7 @@ media = { path = "../media" } malloc_size_of = { workspace = true } paint_api = { workspace = true } diff --git a/patches/components/paint/paint.rs.patch b/patches/components/paint/paint.rs.patch index 648d666..2471b4e 100644 --- a/patches/components/paint/paint.rs.patch +++ b/patches/components/paint/paint.rs.patch @@ -48,7 +48,7 @@ })) } -@@ -537,6 +544,92 @@ +@@ -539,6 +546,92 @@ painter.append_lcp_candidate(lcp_candidate, webview_id, pipeline_id, epoch); } }, @@ -141,7 +141,7 @@ } } -@@ -594,6 +687,152 @@ +@@ -596,6 +689,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 -@@ -738,10 +977,37 @@ +@@ -740,10 +979,37 @@ #[cfg(feature = "webxr")] self.webxr_main_thread.borrow_mut().run_one_frame(); @@ -333,7 +333,7 @@ self.shutdown_state() != ShutdownState::FinishedShuttingDown } -@@ -781,6 +1047,10 @@ +@@ -783,6 +1049,10 @@ if self.shutdown_state() != ShutdownState::NotShuttingDown { return; } @@ -344,7 +344,7 @@ self.painter_mut(webview_id.into()) .notify_input_event(webview_id, event); } -@@ -789,6 +1059,53 @@ +@@ -791,6 +1061,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 9c5f104..43862ce 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; -@@ -81,8 +82,15 @@ +@@ -80,8 +81,15 @@ pub(crate) painter_id: PainterId, /// Our [`WebViewRenderer`]s, one for every `WebView`. @@ -25,7 +25,7 @@ /// Tracks whether or not the view needs to be repainted. pub(crate) needs_repaint: Cell, -@@ -259,6 +267,7 @@ +@@ -258,6 +266,7 @@ painter_id, embedder_to_constellation_sender, webview_renderers: Default::default(), @@ -33,7 +33,7 @@ rendering_context, needs_repaint: Cell::default(), pending_frames: Default::default(), -@@ -279,7 +288,12 @@ +@@ -278,7 +287,12 @@ painter } @@ -47,7 +47,7 @@ // The WebXR thread may make a different context current if let Err(err) = self.rendering_context.make_current() { warn!("Failed to make the rendering context current: {:?}", err); -@@ -286,18 +300,23 @@ +@@ -285,18 +299,23 @@ } let mut need_zoom = false; @@ -81,7 +81,7 @@ } #[track_caller] -@@ -592,7 +611,16 @@ +@@ -591,7 +610,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 +98,7 @@ if webview_renderer.hidden() { continue; } -@@ -653,7 +681,7 @@ +@@ -652,7 +680,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 +107,7 @@ let mut transaction = Transaction::new(); self.send_root_pipeline_display_list_in_transaction(&mut transaction); self.generate_frame(&mut transaction, RenderReasons::SCENE); -@@ -719,6 +747,21 @@ +@@ -718,6 +746,21 @@ self.send_transaction(transaction); } @@ -129,7 +129,7 @@ pub(crate) fn toggle_webrender_debug(&mut self, option: WebRenderDebugOption) { let Some(renderer) = self.webrender_renderer.as_mut() else { return; -@@ -789,6 +832,26 @@ +@@ -788,6 +831,26 @@ self.send_root_pipeline_display_list(); } @@ -156,7 +156,7 @@ pub(crate) fn set_throttled( &mut self, webview_id: WebViewId, -@@ -1201,15 +1264,23 @@ +@@ -1181,15 +1244,23 @@ webview: Box, viewport_details: ViewportDetails, ) { @@ -184,7 +184,7 @@ } pub(crate) fn remove_webview(&mut self, webview_id: WebViewId) { -@@ -1296,25 +1367,26 @@ +@@ -1276,25 +1347,26 @@ } pub(crate) fn notify_input_event(&mut self, webview_id: WebViewId, event: InputEventAndId) { @@ -229,7 +229,7 @@ self.disable_lcp_calculation_for_webview(webview_id); } -@@ -1330,6 +1402,38 @@ +@@ -1310,6 +1382,38 @@ self.disable_lcp_calculation_for_webview(webview_id); } @@ -268,7 +268,7 @@ pub(crate) fn pinch_zoom( &mut self, webview_id: WebViewId, -@@ -1376,7 +1480,6 @@ +@@ -1356,7 +1460,6 @@ result: InputEventResult, ) { let Some(webview_renderer) = self.webview_renderers.get_mut(&webview_id) else { diff --git a/patches/components/shared/paint/lib.rs.patch b/patches/components/shared/paint/lib.rs.patch index ca2dc4c..49402b0 100644 --- a/patches/components/shared/paint/lib.rs.patch +++ b/patches/components/shared/paint/lib.rs.patch @@ -9,7 +9,7 @@ use euclid::{Rect, Scale, Size2D}; use log::warn; use malloc_size_of_derive::MallocSizeOf; -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ use profile_traits::mem::{OpaqueSender, ReportsChan}; use serde::{Deserialize, Serialize}; pub use webrender_api::ExternalImageSource; @@ -18,7 +18,7 @@ use webrender_api::{ BuiltDisplayList, BuiltDisplayListDescriptor, ExternalImage, ExternalImageData, ExternalImageHandler, ExternalImageId, ExternalScrollId, FontInstanceFlags, FontInstanceKey, -@@ -184,6 +184,45 @@ +@@ -187,6 +187,45 @@ ScreenshotReadinessReponse(WebViewId, FxHashMap), /// The candidate of largest-contentful-paint SendLCPCandidate(LCPCandidate, WebViewId, PipelineId, Epoch), @@ -64,7 +64,7 @@ } impl Debug for PaintMessage { -@@ -516,6 +555,65 @@ +@@ -540,6 +579,65 @@ source, )); } -- 2.51.2