From 1641bf31a8474004f2003accd9b9a9ce561f32e7 Mon Sep 17 00:00:00 2001 From: Marco Allegretti Date: Fri, 9 Oct 2026 10:29:24 +0000 Subject: [PATCH] build(servo): trace pending classic scripts instead of rooting them Servo e5d9a51 replaces the root that kept a pending classic script alive with tracing through the document that holds it. A root also kept the script's global alive, so a document dropped while a script was pending would leak. The crash the root fixed stays fixed. --- Cargo.lock | 110 +++++++++++++-------------- README.md | 2 +- crates/weft-app-shell/Cargo.toml | 2 +- crates/weft-servo-shell/Cargo.toml | 2 +- crates/weft-servo-shell/SERVO_PIN.md | 14 ++-- infra/nixos/weft-packages.nix | 2 +- 6 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4fa9716..d6d97f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6590,7 +6590,7 @@ dependencies = [ [[package]] name = "servo" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "accesskit", "bitflags 2.11.0", @@ -6651,7 +6651,7 @@ dependencies = [ [[package]] name = "servo-allocator" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -6662,7 +6662,7 @@ dependencies = [ [[package]] name = "servo-background-hang-monitor" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "backtrace", "crossbeam-channel", @@ -6677,7 +6677,7 @@ dependencies = [ [[package]] name = "servo-background-hang-monitor-api" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "serde", "servo-base", @@ -6686,7 +6686,7 @@ dependencies = [ [[package]] name = "servo-base" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "accesskit", "crossbeam-channel", @@ -6711,7 +6711,7 @@ dependencies = [ [[package]] name = "servo-canvas" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "bytemuck", "crossbeam-channel", @@ -6736,7 +6736,7 @@ dependencies = [ [[package]] name = "servo-canvas-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "crossbeam-channel", "euclid", @@ -6758,7 +6758,7 @@ dependencies = [ [[package]] name = "servo-config" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "serde", "serde_json", @@ -6770,7 +6770,7 @@ dependencies = [ [[package]] name = "servo-config-macro" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "proc-macro2", "quote", @@ -6781,7 +6781,7 @@ dependencies = [ [[package]] name = "servo-constellation" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "backtrace", "content-security-policy", @@ -6828,7 +6828,7 @@ dependencies = [ [[package]] name = "servo-constellation-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "content-security-policy", "encoding_rs", @@ -6863,7 +6863,7 @@ dependencies = [ [[package]] name = "servo-deny-public-fields" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "syn", "synstructure", @@ -6872,7 +6872,7 @@ dependencies = [ [[package]] name = "servo-devtools" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "atomic_refcell", "base64 0.22.1", @@ -6901,7 +6901,7 @@ dependencies = [ [[package]] name = "servo-devtools-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "bitflags 2.11.0", "http 1.4.0", @@ -6920,7 +6920,7 @@ dependencies = [ [[package]] name = "servo-dom-struct" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "proc-macro2", "quote", @@ -6930,7 +6930,7 @@ dependencies = [ [[package]] name = "servo-embedder-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "accesskit", "bitflags 2.11.0", @@ -6963,7 +6963,7 @@ dependencies = [ [[package]] name = "servo-fonts" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "app_units", "bitflags 2.11.0", @@ -7016,7 +7016,7 @@ dependencies = [ [[package]] name = "servo-fonts-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "atomic_refcell", "dwrote", @@ -7039,7 +7039,7 @@ dependencies = [ [[package]] name = "servo-geometry" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "app_units", "euclid", @@ -7052,7 +7052,7 @@ dependencies = [ [[package]] name = "servo-hyper-serde" version = "0.13.2" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "cookie 0.18.1", "headers 0.4.1", @@ -7066,7 +7066,7 @@ dependencies = [ [[package]] name = "servo-jstraceable-derive" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "proc-macro2", "syn", @@ -7076,7 +7076,7 @@ dependencies = [ [[package]] name = "servo-layout" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "accesskit", "app_units", @@ -7130,7 +7130,7 @@ dependencies = [ [[package]] name = "servo-layout-api" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "app_units", "atomic_refcell", @@ -7164,7 +7164,7 @@ dependencies = [ [[package]] name = "servo-malloc-size-of" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "accountable-refcell", "app_units", @@ -7204,7 +7204,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "once_cell", "servo-media-audio", @@ -7217,7 +7217,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "byte-slice-cast", "euclid", @@ -7240,7 +7240,7 @@ dependencies = [ [[package]] name = "servo-media-derive" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "proc-macro2", "quote", @@ -7250,7 +7250,7 @@ dependencies = [ [[package]] name = "servo-media-dummy" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "ipc-channel", "servo-media", @@ -7264,7 +7264,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "ipc-channel", "malloc_size_of_derive", @@ -7278,7 +7278,7 @@ dependencies = [ [[package]] name = "servo-media-streams" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "malloc_size_of_derive", "servo-malloc-size-of", @@ -7288,7 +7288,7 @@ dependencies = [ [[package]] name = "servo-media-thread" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "euclid", "ipc-channel", @@ -7306,7 +7306,7 @@ dependencies = [ [[package]] name = "servo-media-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "malloc_size_of_derive", "servo-malloc-size-of", @@ -7315,7 +7315,7 @@ dependencies = [ [[package]] name = "servo-media-webrtc" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "log", "servo-media-streams", @@ -7325,7 +7325,7 @@ dependencies = [ [[package]] name = "servo-metrics" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "malloc_size_of_derive", "servo-base", @@ -7340,7 +7340,7 @@ dependencies = [ [[package]] name = "servo-net" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "async-compression", "async-recursion", @@ -7409,7 +7409,7 @@ dependencies = [ [[package]] name = "servo-net-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "content-security-policy", "cookie 0.18.1", @@ -7449,7 +7449,7 @@ dependencies = [ [[package]] name = "servo-paint" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "bitflags 2.11.0", "crossbeam-channel", @@ -7486,7 +7486,7 @@ dependencies = [ [[package]] name = "servo-paint-api" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "bitflags 2.11.0", "crossbeam-channel", @@ -7522,7 +7522,7 @@ dependencies = [ [[package]] name = "servo-pixels" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "euclid", "image", @@ -7537,7 +7537,7 @@ dependencies = [ [[package]] name = "servo-profile" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "libc", "log", @@ -7556,7 +7556,7 @@ dependencies = [ [[package]] name = "servo-profile-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "crossbeam-channel", "ipc-channel", @@ -7573,7 +7573,7 @@ dependencies = [ [[package]] name = "servo-script" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "aes", "aes-gcm", @@ -7712,7 +7712,7 @@ dependencies = [ [[package]] name = "servo-script-bindings" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "bitflags 2.11.0", "crossbeam-channel", @@ -7750,7 +7750,7 @@ dependencies = [ [[package]] name = "servo-script-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "accesskit", "content-security-policy", @@ -7787,7 +7787,7 @@ dependencies = [ [[package]] name = "servo-storage" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "libc", "log", @@ -7817,7 +7817,7 @@ dependencies = [ [[package]] name = "servo-storage-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "malloc_size_of_derive", "serde", @@ -7831,7 +7831,7 @@ dependencies = [ [[package]] name = "servo-timers" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "crossbeam-channel", "malloc_size_of_derive", @@ -7841,7 +7841,7 @@ dependencies = [ [[package]] name = "servo-tracing" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "proc-macro2", "quote", @@ -7851,7 +7851,7 @@ dependencies = [ [[package]] name = "servo-url" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "encoding_rs", "malloc_size_of_derive", @@ -7865,7 +7865,7 @@ dependencies = [ [[package]] name = "servo-webgl" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "bitflags 2.11.0", "byteorder", @@ -7889,7 +7889,7 @@ dependencies = [ [[package]] name = "servo-webgpu" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "arrayvec", "euclid", @@ -7908,7 +7908,7 @@ dependencies = [ [[package]] name = "servo-webgpu-traits" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "arrayvec", "malloc_size_of_derive", @@ -7924,7 +7924,7 @@ dependencies = [ [[package]] name = "servo-webxr" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "crossbeam-channel", "euclid", @@ -7943,7 +7943,7 @@ dependencies = [ [[package]] name = "servo-webxr-api" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "euclid", "ipc-channel", @@ -7959,7 +7959,7 @@ dependencies = [ [[package]] name = "servo-xpath" version = "0.0.1" -source = "git+https://github.com/marcoallegretti/servo?rev=5d90f51cf8156cd7f244a42e15f199c531116c21#5d90f51cf8156cd7f244a42e15f199c531116c21" +source = "git+https://github.com/marcoallegretti/servo?rev=e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163#e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" dependencies = [ "log", "malloc_size_of_derive", diff --git a/README.md b/README.md index 76cc394..326d00d 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ See `docs/security.md`. Key points: ## Servo fork -- Servo: `https://github.com/marcoallegretti/servo` at `5d90f51c`, pinned by revision +- Servo: `https://github.com/marcoallegretti/servo` at `e5d9a518`, pinned by revision - Stylo: `https://github.com/marcoallegretti/stylo` at `f1ba4969`, through the root `[patch]` - Patches: `backdrop-filter` parsing (Stylo) and rendering (Servo), rooting of compiled classic scripts and `navigator.servo` exposure (Servo) - See `crates/weft-servo-shell/SERVO_PIN.md` for Servo integration status and known limitations diff --git a/crates/weft-app-shell/Cargo.toml b/crates/weft-app-shell/Cargo.toml index 55ff3fc..ef2ecd9 100644 --- a/crates/weft-app-shell/Cargo.toml +++ b/crates/weft-app-shell/Cargo.toml @@ -27,7 +27,7 @@ toml = { version = "0.8", optional = true } [dependencies.servo] git = "https://github.com/marcoallegretti/servo" -rev = "5d90f51cf8156cd7f244a42e15f199c531116c21" +rev = "e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" optional = true default-features = false diff --git a/crates/weft-servo-shell/Cargo.toml b/crates/weft-servo-shell/Cargo.toml index 5ac6a28..b853710 100644 --- a/crates/weft-servo-shell/Cargo.toml +++ b/crates/weft-servo-shell/Cargo.toml @@ -27,7 +27,7 @@ tungstenite = "0.24" [dependencies.servo] git = "https://github.com/marcoallegretti/servo" -rev = "5d90f51cf8156cd7f244a42e15f199c531116c21" +rev = "e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" optional = true default-features = false diff --git a/crates/weft-servo-shell/SERVO_PIN.md b/crates/weft-servo-shell/SERVO_PIN.md index 142c841..5925f8d 100644 --- a/crates/weft-servo-shell/SERVO_PIN.md +++ b/crates/weft-servo-shell/SERVO_PIN.md @@ -6,14 +6,14 @@ The selected revisions are the ones recorded in the workspace `Cargo.lock`. | Dependency | Source | Revision | Selected by | |------------|--------|----------|-------------| -| Servo (`servo` crate) | | `5d90f51cf8156cd7f244a42e15f199c531116c21` | `rev` in both shell crates' `Cargo.toml` | +| Servo (`servo` crate) | | `e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163` | `rev` in both shell crates' `Cargo.toml` | | Stylo (`stylo`, `selectors`, `servo_arc`, ...) | | `f1ba4969536d63f2e319a561e466c03e78b4a076` | `[patch."https://github.com/servo/stylo"]` in the root `Cargo.toml` | The Servo revision is `servo-weft` commit `8e7dc40` (backdrop-filter rendering), plus `f0bb1aa`, which fixes that commit's `servo-layout` build errors, plus -`b87e5a6`, which keeps compiled classic scripts rooted until they run, and -`5d90f51`, which withholds `navigator.servo` from `about:blank` and -`about:srcdoc` documents. It lives +`b87e5a6` and `e5d9a51`, which keep compiled classic scripts traced until +they run, and `5d90f51`, which withholds `navigator.servo` from +`about:blank` and `about:srcdoc` documents. It lives on the fork branch `fix/root-pending-classic-scripts`, which is based on `fix/backdrop-filter-build-errors`, until both are merged into `servo-weft`; keep those branches until then so the revisions stay fetchable. @@ -41,7 +41,7 @@ servo-embed = ["dep:servo", "dep:winit", "dep:softbuffer"] [dependencies.servo] git = "https://github.com/marcoallegretti/servo" -rev = "5d90f51cf8156cd7f244a42e15f199c531116c21" +rev = "e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163" optional = true default-features = false @@ -159,7 +159,7 @@ exercised is listed as unverified. rather than tracking a branch, so a rebuild selects the same code. A pinned revision must stay reachable from a published branch: never force-push, rebase or delete a branch that contains a revision a WEFT lockfile selects. -Today Servo `5d90f51` is reachable only from `fix/root-pending-classic-scripts` +Today Servo `e5d9a51` is reachable only from `fix/root-pending-classic-scripts` and Stylo `f1ba496` only from Stylo's `servo-weft`. To move to new revisions: @@ -186,5 +186,5 @@ Each fork patch keeps its purpose, upstream status and removal condition here. | Stylo: parse `backdrop-filter` for Servo | stylo `f1ba496` | Remove the `layout.unimplemented` gate | Not submitted | Upstream Stylo parses it for Servo | | Servo: render `backdrop-filter` | servo `8e7dc40` | Stacking context and display list support | servo/servo issue [#41567](https://github.com/servo/servo/issues/41567) | Equivalent upstream support | | Servo: fix `build_backdrop_filter` types | servo `f0bb1aa` | Make `servo-layout` compile | Part of the patch above | Same as above | -| Servo: root compiled classic scripts | servo `b87e5a6` | A parser-blocking script waiting for a stylesheet was freed by a garbage collection and crashed the content process when it ran | Not submitted | Upstream roots or traces `ClassicScript::record` | +| Servo: trace compiled classic scripts | servo `b87e5a6`, `e5d9a51` | A parser-blocking script waiting for a stylesheet was freed by a garbage collection and crashed the content process when it ran | Not submitted | Upstream traces `ClassicScript::record` | | Servo: no `navigator.servo` for blank and srcdoc documents | servo `5d90f51` | An application's `about:srcdoc` frame could change engine preferences | Not submitted | Upstream limits `ServoInternals` exposure the same way | diff --git a/infra/nixos/weft-packages.nix b/infra/nixos/weft-packages.nix index 84ac911..f3a7ffc 100644 --- a/infra/nixos/weft-packages.nix +++ b/infra/nixos/weft-packages.nix @@ -13,7 +13,7 @@ let # One hash per git source in Cargo.lock: the Servo fork and the Stylo fork # (keyed by its `selectors` crate). Every package vendors both, so both must # match the pinned revisions. Recompute them whenever a revision changes. - # The Servo hash is not yet known for 5d90f51; a Nix build reports it. + # The Servo hash is not yet known for e5d9a51; a Nix build reports it. outputHashes = { "servo-0.0.1" = pkgs.lib.fakeHash; "selectors-0.36.0" = "13y6pa19j4w2zsxfhv6mrl03wsa0frazlsssbqkzpwci8k9gzl4i";