From eef9399b82b05c04b15ad1e32e379faa084b3f45 Mon Sep 17 00:00:00 2001 From: webbeef Date: Sat, 31 Jan 2026 18:56:23 -0800 Subject: [PATCH] chore: update to Servo c197caff99fff2aedb5ab351b39ae086cdb38ff9 --- Cargo.lock | 34 +++++++------------ Cargo.toml | 16 ++++----- forkme.lock | 2 +- .../components/script/dom/document.rs.patch | 16 ++++----- .../script/dom/globalscope.rs.patch | 8 ++--- 5 files changed, 33 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ad5db0..de5c301 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2036,14 +2036,6 @@ dependencies = [ [[package]] name = "dom_struct" version = "0.1.0" -dependencies = [ - "quote", - "syn 2.0.114", -] - -[[package]] -name = "domobject_derive" -version = "0.1.0" dependencies = [ "proc-macro2", "quote", @@ -7657,7 +7649,6 @@ dependencies = [ "devtools_traits", "digest", "dom_struct", - "domobject_derive", "ecdsa", "elliptic-curve", "embedder_traits", @@ -7769,7 +7760,6 @@ dependencies = [ "crossbeam-channel", "deny_public_fields", "dom_struct", - "domobject_derive", "encoding_rs", "html5ever", "indexmap", @@ -7924,7 +7914,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.35.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "bitflags 2.10.0", "cssparser", @@ -8240,7 +8230,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.3" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "serde", "stable_deref_trait", @@ -8679,7 +8669,7 @@ dependencies = [ [[package]] name = "stylo" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "app_units", "arrayvec", @@ -8734,7 +8724,7 @@ dependencies = [ [[package]] name = "stylo_atoms" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "string_cache", "string_cache_codegen", @@ -8743,12 +8733,12 @@ dependencies = [ [[package]] name = "stylo_config" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" [[package]] name = "stylo_derive" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "darling", "proc-macro2", @@ -8760,7 +8750,7 @@ dependencies = [ [[package]] name = "stylo_dom" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "bitflags 2.10.0", "stylo_malloc_size_of", @@ -8769,7 +8759,7 @@ dependencies = [ [[package]] name = "stylo_malloc_size_of" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "app_units", "cssparser", @@ -8786,12 +8776,12 @@ dependencies = [ [[package]] name = "stylo_static_prefs" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" [[package]] name = "stylo_traits" version = "0.11.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "app_units", "bitflags 2.10.0", @@ -9214,7 +9204,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.3.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "cssparser", "servo_arc", @@ -9227,7 +9217,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?rev=63d8ef5c546deac25ed57e79b56ce3a887751a14#63d8ef5c546deac25ed57e79b56ce3a887751a14" +source = "git+https://github.com/servo/stylo?rev=fce45cfa72008327d714575913bc9c968fa1446c#fce45cfa72008327d714575913bc9c968fa1446c" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 97fb02a..fa0b2be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -148,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 = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } +selectors = { git = "https://github.com/servo/stylo", rev = "fce45cfa72008327d714575913bc9c968fa1446c" } serde = "1.0.228" serde_bytes = "0.11" serde_core = "1.0.226" @@ -157,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 = "63d8ef5c546deac25ed57e79b56ce3a887751a14" } +servo_arc = { git = "https://github.com/servo/stylo", rev = "fce45cfa72008327d714575913bc9c968fa1446c" } sha1 = "0.10" sha2 = "0.10" sha3 = "0.10" @@ -166,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 = "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" } +stylo = { git = "https://github.com/servo/stylo", rev = "fce45cfa72008327d714575913bc9c968fa1446c" } +stylo_atoms = { git = "https://github.com/servo/stylo", rev = "fce45cfa72008327d714575913bc9c968fa1446c" } +stylo_config = { git = "https://github.com/servo/stylo", rev = "fce45cfa72008327d714575913bc9c968fa1446c" } +stylo_dom = { git = "https://github.com/servo/stylo", rev = "fce45cfa72008327d714575913bc9c968fa1446c" } +stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "fce45cfa72008327d714575913bc9c968fa1446c" } +stylo_traits = { git = "https://github.com/servo/stylo", rev = "fce45cfa72008327d714575913bc9c968fa1446c" } 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 bb0d384..46e3757 100644 --- a/forkme.lock +++ b/forkme.lock @@ -1 +1 @@ -68fa945f3824afd11c28340f9af7ff26d205c833 +c197caff99fff2aedb5ab351b39ae086cdb38ff9 diff --git a/patches/components/script/dom/document.rs.patch b/patches/components/script/dom/document.rs.patch index a7d68ff..b4384ad 100644 --- a/patches/components/script/dom/document.rs.patch +++ b/patches/components/script/dom/document.rs.patch @@ -56,7 +56,7 @@ self.dirty_all_nodes(); self.window().resume(can_gc); media.resume(&client_context_id); -@@ -1242,6 +1255,9 @@ +@@ -1248,6 +1261,9 @@ LoadStatus::Started, )); self.send_to_embedder(EmbedderMsg::Status(self.webview_id(), None)); @@ -66,7 +66,7 @@ } }, DocumentReadyState::Complete => { -@@ -1250,6 +1266,9 @@ +@@ -1256,6 +1272,9 @@ self.webview_id(), LoadStatus::Complete, )); @@ -76,7 +76,7 @@ } update_with_current_instant(&self.dom_complete); }, -@@ -1658,7 +1677,13 @@ +@@ -1664,7 +1683,13 @@ let window = self.window(); if window.is_top_level() { let title = self.title().map(String::from); @@ -91,7 +91,7 @@ } } -@@ -1667,6 +1692,18 @@ +@@ -1673,6 +1698,18 @@ window.send_to_embedder(msg); } @@ -110,7 +110,7 @@ pub(crate) fn dirty_all_nodes(&self) { let root = match self.GetDocumentElement() { Some(root) => root, -@@ -3152,9 +3189,59 @@ +@@ -3158,9 +3195,59 @@ current_rendering_epoch, ); @@ -170,7 +170,7 @@ pub(crate) fn handle_no_longer_waiting_on_asynchronous_image_updates(&self) { self.waiting_on_canvas_image_updates.set(false); } -@@ -3887,6 +3974,7 @@ +@@ -3893,6 +3980,7 @@ active_sandboxing_flag_set: Cell::new(SandboxingFlagSet::empty()), creation_sandboxing_flag_set: Cell::new(creation_sandboxing_flag_set), favicon: RefCell::new(None), @@ -178,7 +178,7 @@ websockets: DOMTracker::new(), details_name_groups: Default::default(), protocol_handler_automation_mode: Default::default(), -@@ -4981,6 +5069,36 @@ +@@ -4987,6 +5075,36 @@ pub(crate) fn notify_embedder_favicon(&self) { if let Some(ref image) = *self.favicon.borrow() { @@ -215,7 +215,7 @@ self.send_to_embedder(EmbedderMsg::NewFavicon(self.webview_id(), image.clone())); } } -@@ -4989,6 +5107,20 @@ +@@ -4995,6 +5113,20 @@ *self.favicon.borrow_mut() = Some(favicon); self.notify_embedder_favicon(); } diff --git a/patches/components/script/dom/globalscope.rs.patch b/patches/components/script/dom/globalscope.rs.patch index e1cec39..8433a51 100644 --- a/patches/components/script/dom/globalscope.rs.patch +++ b/patches/components/script/dom/globalscope.rs.patch @@ -1,6 +1,6 @@ --- original +++ modified -@@ -375,6 +375,16 @@ +@@ -376,6 +376,16 @@ /// Is considered in a secure context inherited_secure_context: Option, @@ -17,7 +17,7 @@ /// Directory to store unminified scripts for this window if unminify-js /// opt is enabled. unminified_js_dir: Option, -@@ -775,6 +785,8 @@ +@@ -776,6 +786,8 @@ #[cfg(feature = "webgpu")] gpu_id_hub: Arc, inherited_secure_context: Option, unminify_js: bool, @@ -26,7 +26,7 @@ font_context: Option>, ) -> Self { Self { -@@ -818,6 +830,8 @@ +@@ -819,6 +831,8 @@ console_group_stack: DomRefCell::new(Vec::new()), console_count_map: Default::default(), inherited_secure_context, @@ -35,7 +35,7 @@ unminified_js_dir: unminify_js.then(|| unminified_path("unminified-js")), byte_length_queuing_strategy_size_function: OnceCell::new(), count_queuing_strategy_size_function: OnceCell::new(), -@@ -3122,6 +3136,16 @@ +@@ -3123,6 +3137,16 @@ self.inherited_secure_context } -- 2.51.2