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.
This commit is contained in:
Marco Allegretti 2026-10-09 10:29:24 +00:00
parent 687439a2a3
commit 1641bf31a8
No known key found for this signature in database
6 changed files with 66 additions and 66 deletions

110
Cargo.lock generated
View file

@ -6590,7 +6590,7 @@ dependencies = [
[[package]] [[package]]
name = "servo" name = "servo"
version = "0.0.1" 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 = [ dependencies = [
"accesskit", "accesskit",
"bitflags 2.11.0", "bitflags 2.11.0",
@ -6651,7 +6651,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-allocator" name = "servo-allocator"
version = "0.0.1" 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 = [ dependencies = [
"libc", "libc",
"tikv-jemalloc-sys", "tikv-jemalloc-sys",
@ -6662,7 +6662,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-background-hang-monitor" name = "servo-background-hang-monitor"
version = "0.0.1" 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 = [ dependencies = [
"backtrace", "backtrace",
"crossbeam-channel", "crossbeam-channel",
@ -6677,7 +6677,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-background-hang-monitor-api" name = "servo-background-hang-monitor-api"
version = "0.0.1" 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 = [ dependencies = [
"serde", "serde",
"servo-base", "servo-base",
@ -6686,7 +6686,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-base" name = "servo-base"
version = "0.0.1" 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 = [ dependencies = [
"accesskit", "accesskit",
"crossbeam-channel", "crossbeam-channel",
@ -6711,7 +6711,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-canvas" name = "servo-canvas"
version = "0.0.1" 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 = [ dependencies = [
"bytemuck", "bytemuck",
"crossbeam-channel", "crossbeam-channel",
@ -6736,7 +6736,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-canvas-traits" name = "servo-canvas-traits"
version = "0.0.1" 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 = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"euclid", "euclid",
@ -6758,7 +6758,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-config" name = "servo-config"
version = "0.0.1" 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 = [ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
@ -6770,7 +6770,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-config-macro" name = "servo-config-macro"
version = "0.0.1" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -6781,7 +6781,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-constellation" name = "servo-constellation"
version = "0.0.1" 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 = [ dependencies = [
"backtrace", "backtrace",
"content-security-policy", "content-security-policy",
@ -6828,7 +6828,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-constellation-traits" name = "servo-constellation-traits"
version = "0.0.1" 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 = [ dependencies = [
"content-security-policy", "content-security-policy",
"encoding_rs", "encoding_rs",
@ -6863,7 +6863,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-deny-public-fields" name = "servo-deny-public-fields"
version = "0.0.1" 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 = [ dependencies = [
"syn", "syn",
"synstructure", "synstructure",
@ -6872,7 +6872,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-devtools" name = "servo-devtools"
version = "0.0.1" 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 = [ dependencies = [
"atomic_refcell", "atomic_refcell",
"base64 0.22.1", "base64 0.22.1",
@ -6901,7 +6901,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-devtools-traits" name = "servo-devtools-traits"
version = "0.0.1" 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 = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"http 1.4.0", "http 1.4.0",
@ -6920,7 +6920,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-dom-struct" name = "servo-dom-struct"
version = "0.0.1" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -6930,7 +6930,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-embedder-traits" name = "servo-embedder-traits"
version = "0.0.1" 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 = [ dependencies = [
"accesskit", "accesskit",
"bitflags 2.11.0", "bitflags 2.11.0",
@ -6963,7 +6963,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-fonts" name = "servo-fonts"
version = "0.0.1" 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 = [ dependencies = [
"app_units", "app_units",
"bitflags 2.11.0", "bitflags 2.11.0",
@ -7016,7 +7016,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-fonts-traits" name = "servo-fonts-traits"
version = "0.0.1" 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 = [ dependencies = [
"atomic_refcell", "atomic_refcell",
"dwrote", "dwrote",
@ -7039,7 +7039,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-geometry" name = "servo-geometry"
version = "0.0.1" 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 = [ dependencies = [
"app_units", "app_units",
"euclid", "euclid",
@ -7052,7 +7052,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-hyper-serde" name = "servo-hyper-serde"
version = "0.13.2" 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 = [ dependencies = [
"cookie 0.18.1", "cookie 0.18.1",
"headers 0.4.1", "headers 0.4.1",
@ -7066,7 +7066,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-jstraceable-derive" name = "servo-jstraceable-derive"
version = "0.0.1" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"syn", "syn",
@ -7076,7 +7076,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-layout" name = "servo-layout"
version = "0.0.1" 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 = [ dependencies = [
"accesskit", "accesskit",
"app_units", "app_units",
@ -7130,7 +7130,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-layout-api" name = "servo-layout-api"
version = "0.0.1" 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 = [ dependencies = [
"app_units", "app_units",
"atomic_refcell", "atomic_refcell",
@ -7164,7 +7164,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-malloc-size-of" name = "servo-malloc-size-of"
version = "0.0.1" 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 = [ dependencies = [
"accountable-refcell", "accountable-refcell",
"app_units", "app_units",
@ -7204,7 +7204,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media" name = "servo-media"
version = "0.0.1" 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 = [ dependencies = [
"once_cell", "once_cell",
"servo-media-audio", "servo-media-audio",
@ -7217,7 +7217,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-audio" name = "servo-media-audio"
version = "0.0.1" 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 = [ dependencies = [
"byte-slice-cast", "byte-slice-cast",
"euclid", "euclid",
@ -7240,7 +7240,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-derive" name = "servo-media-derive"
version = "0.0.1" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -7250,7 +7250,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-dummy" name = "servo-media-dummy"
version = "0.0.1" 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 = [ dependencies = [
"ipc-channel", "ipc-channel",
"servo-media", "servo-media",
@ -7264,7 +7264,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-player" name = "servo-media-player"
version = "0.0.1" 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 = [ dependencies = [
"ipc-channel", "ipc-channel",
"malloc_size_of_derive", "malloc_size_of_derive",
@ -7278,7 +7278,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-streams" name = "servo-media-streams"
version = "0.0.1" 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 = [ dependencies = [
"malloc_size_of_derive", "malloc_size_of_derive",
"servo-malloc-size-of", "servo-malloc-size-of",
@ -7288,7 +7288,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-thread" name = "servo-media-thread"
version = "0.0.1" 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 = [ dependencies = [
"euclid", "euclid",
"ipc-channel", "ipc-channel",
@ -7306,7 +7306,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-traits" name = "servo-media-traits"
version = "0.0.1" 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 = [ dependencies = [
"malloc_size_of_derive", "malloc_size_of_derive",
"servo-malloc-size-of", "servo-malloc-size-of",
@ -7315,7 +7315,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-webrtc" name = "servo-media-webrtc"
version = "0.0.1" 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 = [ dependencies = [
"log", "log",
"servo-media-streams", "servo-media-streams",
@ -7325,7 +7325,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-metrics" name = "servo-metrics"
version = "0.0.1" 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 = [ dependencies = [
"malloc_size_of_derive", "malloc_size_of_derive",
"servo-base", "servo-base",
@ -7340,7 +7340,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-net" name = "servo-net"
version = "0.0.1" 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 = [ dependencies = [
"async-compression", "async-compression",
"async-recursion", "async-recursion",
@ -7409,7 +7409,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-net-traits" name = "servo-net-traits"
version = "0.0.1" 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 = [ dependencies = [
"content-security-policy", "content-security-policy",
"cookie 0.18.1", "cookie 0.18.1",
@ -7449,7 +7449,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-paint" name = "servo-paint"
version = "0.0.1" 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 = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"crossbeam-channel", "crossbeam-channel",
@ -7486,7 +7486,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-paint-api" name = "servo-paint-api"
version = "0.0.1" 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 = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"crossbeam-channel", "crossbeam-channel",
@ -7522,7 +7522,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-pixels" name = "servo-pixels"
version = "0.0.1" 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 = [ dependencies = [
"euclid", "euclid",
"image", "image",
@ -7537,7 +7537,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-profile" name = "servo-profile"
version = "0.0.1" 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 = [ dependencies = [
"libc", "libc",
"log", "log",
@ -7556,7 +7556,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-profile-traits" name = "servo-profile-traits"
version = "0.0.1" 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 = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"ipc-channel", "ipc-channel",
@ -7573,7 +7573,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-script" name = "servo-script"
version = "0.0.1" 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 = [ dependencies = [
"aes", "aes",
"aes-gcm", "aes-gcm",
@ -7712,7 +7712,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-script-bindings" name = "servo-script-bindings"
version = "0.0.1" 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 = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"crossbeam-channel", "crossbeam-channel",
@ -7750,7 +7750,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-script-traits" name = "servo-script-traits"
version = "0.0.1" 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 = [ dependencies = [
"accesskit", "accesskit",
"content-security-policy", "content-security-policy",
@ -7787,7 +7787,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-storage" name = "servo-storage"
version = "0.0.1" 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 = [ dependencies = [
"libc", "libc",
"log", "log",
@ -7817,7 +7817,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-storage-traits" name = "servo-storage-traits"
version = "0.0.1" 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 = [ dependencies = [
"malloc_size_of_derive", "malloc_size_of_derive",
"serde", "serde",
@ -7831,7 +7831,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-timers" name = "servo-timers"
version = "0.0.1" 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 = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"malloc_size_of_derive", "malloc_size_of_derive",
@ -7841,7 +7841,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-tracing" name = "servo-tracing"
version = "0.0.1" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -7851,7 +7851,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-url" name = "servo-url"
version = "0.0.1" 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 = [ dependencies = [
"encoding_rs", "encoding_rs",
"malloc_size_of_derive", "malloc_size_of_derive",
@ -7865,7 +7865,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-webgl" name = "servo-webgl"
version = "0.0.1" 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 = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"byteorder", "byteorder",
@ -7889,7 +7889,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-webgpu" name = "servo-webgpu"
version = "0.0.1" 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 = [ dependencies = [
"arrayvec", "arrayvec",
"euclid", "euclid",
@ -7908,7 +7908,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-webgpu-traits" name = "servo-webgpu-traits"
version = "0.0.1" 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 = [ dependencies = [
"arrayvec", "arrayvec",
"malloc_size_of_derive", "malloc_size_of_derive",
@ -7924,7 +7924,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-webxr" name = "servo-webxr"
version = "0.0.1" 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 = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"euclid", "euclid",
@ -7943,7 +7943,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-webxr-api" name = "servo-webxr-api"
version = "0.0.1" 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 = [ dependencies = [
"euclid", "euclid",
"ipc-channel", "ipc-channel",
@ -7959,7 +7959,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-xpath" name = "servo-xpath"
version = "0.0.1" 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 = [ dependencies = [
"log", "log",
"malloc_size_of_derive", "malloc_size_of_derive",

View file

@ -95,7 +95,7 @@ See `docs/security.md`. Key points:
## Servo fork ## 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]` - 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) - 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 - See `crates/weft-servo-shell/SERVO_PIN.md` for Servo integration status and known limitations

View file

@ -27,7 +27,7 @@ toml = { version = "0.8", optional = true }
[dependencies.servo] [dependencies.servo]
git = "https://github.com/marcoallegretti/servo" git = "https://github.com/marcoallegretti/servo"
rev = "5d90f51cf8156cd7f244a42e15f199c531116c21" rev = "e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163"
optional = true optional = true
default-features = false default-features = false

View file

@ -27,7 +27,7 @@ tungstenite = "0.24"
[dependencies.servo] [dependencies.servo]
git = "https://github.com/marcoallegretti/servo" git = "https://github.com/marcoallegretti/servo"
rev = "5d90f51cf8156cd7f244a42e15f199c531116c21" rev = "e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163"
optional = true optional = true
default-features = false default-features = false

View file

@ -6,14 +6,14 @@ The selected revisions are the ones recorded in the workspace `Cargo.lock`.
| Dependency | Source | Revision | Selected by | | Dependency | Source | Revision | Selected by |
|------------|--------|----------|-------------| |------------|--------|----------|-------------|
| Servo (`servo` crate) | <https://github.com/marcoallegretti/servo> | `5d90f51cf8156cd7f244a42e15f199c531116c21` | `rev` in both shell crates' `Cargo.toml` | | Servo (`servo` crate) | <https://github.com/marcoallegretti/servo> | `e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163` | `rev` in both shell crates' `Cargo.toml` |
| Stylo (`stylo`, `selectors`, `servo_arc`, ...) | <https://github.com/marcoallegretti/stylo> | `f1ba4969536d63f2e319a561e466c03e78b4a076` | `[patch."https://github.com/servo/stylo"]` in the root `Cargo.toml` | | Stylo (`stylo`, `selectors`, `servo_arc`, ...) | <https://github.com/marcoallegretti/stylo> | `f1ba4969536d63f2e319a561e466c03e78b4a076` | `[patch."https://github.com/servo/stylo"]` in the root `Cargo.toml` |
The Servo revision is `servo-weft` commit `8e7dc40` (backdrop-filter rendering), The Servo revision is `servo-weft` commit `8e7dc40` (backdrop-filter rendering),
plus `f0bb1aa`, which fixes that commit's `servo-layout` build errors, plus plus `f0bb1aa`, which fixes that commit's `servo-layout` build errors, plus
`b87e5a6`, which keeps compiled classic scripts rooted until they run, and `b87e5a6` and `e5d9a51`, which keep compiled classic scripts traced until
`5d90f51`, which withholds `navigator.servo` from `about:blank` and they run, and `5d90f51`, which withholds `navigator.servo` from
`about:srcdoc` documents. It lives `about:blank` and `about:srcdoc` documents. It lives
on the fork branch `fix/root-pending-classic-scripts`, which is based on 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`; `fix/backdrop-filter-build-errors`, until both are merged into `servo-weft`;
keep those branches until then so the revisions stay fetchable. keep those branches until then so the revisions stay fetchable.
@ -41,7 +41,7 @@ servo-embed = ["dep:servo", "dep:winit", "dep:softbuffer"]
[dependencies.servo] [dependencies.servo]
git = "https://github.com/marcoallegretti/servo" git = "https://github.com/marcoallegretti/servo"
rev = "5d90f51cf8156cd7f244a42e15f199c531116c21" rev = "e5d9a518ebddb5ebd6af404d1fd4e00ea0f77163"
optional = true optional = true
default-features = false 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 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, revision must stay reachable from a published branch: never force-push,
rebase or delete a branch that contains a revision a WEFT lockfile selects. 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`. and Stylo `f1ba496` only from Stylo's `servo-weft`.
To move to new revisions: 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 | | 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: 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: 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 | | 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 |

View file

@ -13,7 +13,7 @@ let
# One hash per git source in Cargo.lock: the Servo fork and the Stylo fork # 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 # (keyed by its `selectors` crate). Every package vendors both, so both must
# match the pinned revisions. Recompute them whenever a revision changes. # 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 = { outputHashes = {
"servo-0.0.1" = pkgs.lib.fakeHash; "servo-0.0.1" = pkgs.lib.fakeHash;
"selectors-0.36.0" = "13y6pa19j4w2zsxfhv6mrl03wsa0frazlsssbqkzpwci8k9gzl4i"; "selectors-0.36.0" = "13y6pa19j4w2zsxfhv6mrl03wsa0frazlsssbqkzpwci8k9gzl4i";