From 8dbe8245e179a280d995f6a5d9d9ded59ec7a907 Mon Sep 17 00:00:00 2001 From: Jason Tsai Date: Mon, 13 Jan 2025 22:10:49 +0900 Subject: [PATCH] chore: update servo --- Cargo.lock | 859 +++++++++++++++++++++++++++++++-------------------- Cargo.toml | 53 ++-- src/main.rs | 8 + src/verso.rs | 26 +- 4 files changed, 569 insertions(+), 377 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de4c84ec..49070ed6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -130,7 +130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.6.0", + "bitflags 2.7.0", "cc", "cesu8", "jni", @@ -294,19 +294,23 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "async-tungstenite" -version = "0.23.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +checksum = "1c348fb0b6d132c596eca3dcd941df48fb597aafcb07a738ec41c004b087dc99" dependencies = [ + "atomic-waker", + "futures-core", "futures-io", + "futures-task", "futures-util", "log", "pin-project-lite", + "rustls-pki-types", "tokio", "tokio-rustls", "tungstenite", @@ -357,7 +361,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "background_hang_monitor" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "background_hang_monitor_api", "backtrace", @@ -375,7 +379,7 @@ dependencies = [ [[package]] name = "background_hang_monitor_api" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "ipc-channel", @@ -400,7 +404,7 @@ dependencies = [ [[package]] name = "base" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "crossbeam-channel", "ipc-channel", @@ -411,7 +415,7 @@ dependencies = [ "serde", "servo_malloc_size_of", "static_assertions", - "time 0.3.36", + "time 0.3.37", "webrender_api", "windows-sys 0.59.0", ] @@ -443,7 +447,7 @@ version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "cexpr", "clang-sys", "itertools 0.13.0", @@ -452,7 +456,7 @@ dependencies = [ "regex", "rustc-hash 2.1.0", "shlex", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -484,9 +488,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" dependencies = [ "serde", ] @@ -527,9 +531,9 @@ dependencies = [ [[package]] name = "bluetooth" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "bluetooth_traits", "blurmock", "embedder_traits", @@ -543,7 +547,7 @@ dependencies = [ [[package]] name = "bluetooth_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "embedder_traits", "ipc-channel", @@ -634,7 +638,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "cairo-sys-rs", "glib", "libc", @@ -669,7 +673,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "log", "polling", "rustix", @@ -692,10 +696,10 @@ dependencies = [ [[package]] name = "canvas" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "app_units", - "bitflags 2.6.0", + "bitflags 2.7.0", "byteorder", "canvas_traits", "crossbeam-channel", @@ -726,7 +730,7 @@ dependencies = [ [[package]] name = "canvas_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "crossbeam-channel", @@ -776,9 +780,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.7" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" dependencies = [ "jobserver", "libc", @@ -951,7 +955,7 @@ dependencies = [ [[package]] name = "compositing_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "crossbeam-channel", @@ -980,7 +984,7 @@ dependencies = [ [[package]] name = "constellation" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "background_hang_monitor", "background_hang_monitor_api", @@ -995,7 +999,7 @@ dependencies = [ "euclid", "fonts", "gaol", - "http", + "http 1.2.0", "ipc-channel", "keyboard-types", "log", @@ -1025,7 +1029,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0db809cdd8bf9d875323a8bbb5951d582042a3d279ee861be9cc8f7be24b46f" dependencies = [ "base64 0.22.1", - "bitflags 2.6.0", + "bitflags 2.7.0", "once_cell", "percent-encoding", "regex", @@ -1040,7 +1044,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ - "time 0.3.36", + "time 0.3.37", "version_check", ] @@ -1050,7 +1054,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ - "time 0.3.36", + "time 0.3.37", "version_check", ] @@ -1205,7 +1209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1215,7 +1219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1253,7 +1257,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1264,7 +1268,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1282,9 +1286,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "deny_public_fields" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] @@ -1306,21 +1310,21 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "devtools" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "chrono", "crossbeam-channel", "devtools_traits", "embedder_traits", - "headers", - "http", + "headers 0.4.0", + "http 1.2.0", "ipc-channel", "log", "net_traits", @@ -1335,11 +1339,11 @@ dependencies = [ [[package]] name = "devtools_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", - "bitflags 2.6.0", - "http", + "bitflags 2.7.0", + "http 1.2.0", "ipc-channel", "malloc_size_of_derive", "net_traits", @@ -1368,7 +1372,7 @@ dependencies = [ "diplomat_core", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1392,7 +1396,7 @@ dependencies = [ "serde", "smallvec", "strck_ident", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1430,7 +1434,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1454,29 +1458,29 @@ dependencies = [ [[package]] name = "dom" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "malloc_size_of", ] [[package]] name = "dom_struct" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "domobject_derive" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1529,7 +1533,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedder_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "cfg-if", @@ -1741,7 +1745,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "byteorder", "core-foundation", "core-graphics", @@ -1763,12 +1767,12 @@ dependencies = [ [[package]] name = "fonts" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "app_units", "atomic_refcell", "base", - "bitflags 2.6.0", + "bitflags 2.7.0", "byteorder", "core-foundation", "core-graphics", @@ -1813,7 +1817,7 @@ dependencies = [ [[package]] name = "fonts_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "malloc_size_of_derive", "range", @@ -1859,7 +1863,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1970,7 +1974,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2204,7 +2208,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "futures-channel", "futures-core", "futures-executor", @@ -2232,7 +2236,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2274,11 +2278,11 @@ dependencies = [ [[package]] name = "glutin" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec69412a0bf07ea7607e638b415447857a808846c2b685a43c8aa18bc6d5e499" +checksum = "03642b8b0cce622392deb0ee3e88511f75df2daac806102597905c3ea1974848" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "cfg_aliases", "cgl", "core-foundation", @@ -2311,9 +2315,9 @@ dependencies = [ [[package]] name = "glutin_egl_sys" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae99fff4d2850dbe6fb8c1fa8e4fead5525bab715beaacfccf3fb994e01c827" +checksum = "4c4680ba6195f424febdc3ba46e7a42a0e58743f2edb115297b86d7f8ecc02d2" dependencies = [ "gl_generator", "windows-sys 0.52.0", @@ -2321,9 +2325,9 @@ dependencies = [ [[package]] name = "glutin_glx_sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2b2d3918e76e18e08796b55eb64e8fe6ec67d5a6b2e2a7e2edce224ad24c63" +checksum = "8a7bb2938045a88b612499fbcba375a77198e01306f52272e692f8c1f3751185" dependencies = [ "gl_generator", "x11-dl", @@ -2331,9 +2335,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" +checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e" dependencies = [ "gl_generator", ] @@ -2355,7 +2359,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "gpu-alloc-types", ] @@ -2365,7 +2369,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", ] [[package]] @@ -2386,7 +2390,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "gpu-descriptor-types", "hashbrown", ] @@ -2397,7 +2401,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", ] [[package]] @@ -2455,7 +2459,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2469,7 +2473,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.12", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.2.0", "indexmap", "slab", "tokio", @@ -2519,8 +2542,23 @@ checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ "base64 0.21.7", "bytes", - "headers-core", - "http", + "headers-core 0.2.0", + "http 0.2.12", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core 0.3.0", + "http 1.2.0", "httpdate", "mime", "sha1", @@ -2532,7 +2570,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.12", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http 1.2.0", ] [[package]] @@ -2582,7 +2629,7 @@ dependencies = [ "markup5ever", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2596,6 +2643,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -2603,7 +2661,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.2.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -2627,17 +2708,17 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -2649,31 +2730,73 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", - "http", - "hyper", + "http 1.2.0", + "hyper 1.5.2", + "hyper-util", "log", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", "webpki-roots", ] +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "hyper 1.5.2", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "hyper_serde" version = "0.13.2" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "cookie 0.18.1", - "headers", - "http", - "hyper", + "headers 0.4.0", + "http 1.2.0", + "hyper 1.5.2", "mime", "serde", "serde_bytes", @@ -3073,7 +3196,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -3306,9 +3429,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.74" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -3317,10 +3440,10 @@ dependencies = [ [[package]] name = "jstraceable_derive" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "proc-macro2", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] @@ -3330,7 +3453,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "serde", "unicode-segmentation", ] @@ -3355,12 +3478,12 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "layout_2020" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "app_units", "atomic_refcell", "base", - "bitflags 2.6.0", + "bitflags 2.7.0", "canvas_traits", "data-url", "embedder_traits", @@ -3401,7 +3524,7 @@ dependencies = [ [[package]] name = "layout_thread_2020" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "app_units", "base", @@ -3489,9 +3612,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "libc", - "redox_syscall 0.5.7", + "redox_syscall 0.5.8", ] [[package]] @@ -3515,9 +3638,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa" dependencies = [ "cc", "libc", @@ -3527,9 +3650,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -3597,7 +3720,7 @@ dependencies = [ [[package]] name = "malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "app_units", "cssparser", @@ -3618,7 +3741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f44db74bde26fdf427af23f1d146c211aed857c59e3be750cf2617f6b0b05c94" dependencies = [ "proc-macro2", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] @@ -3645,7 +3768,7 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "media" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "euclid", "fnv", @@ -3698,10 +3821,9 @@ dependencies = [ [[package]] name = "metal" version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3572083504c43e14aec05447f8a3d57cce0f66d7a3c1b9058572eca4d70ab9" +source = "git+https://github.com/gfx-rs/metal-rs.git?rev=ef768ff9d7#ef768ff9d742ae6a0f4e83ddc8031264e7d460c4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3713,7 +3835,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "ipc-channel", @@ -3844,11 +3966,11 @@ dependencies = [ [[package]] name = "naga" version = "23.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93#0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93" +source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.6.0", + "bitflags 2.7.0", "cfg_aliases", "codespan-reporting", "hexf-parse", @@ -3856,8 +3978,9 @@ dependencies = [ "log", "rustc-hash 1.1.0", "spirv", + "strum", "termcolor", - "thiserror 2.0.9", + "thiserror 2.0.11", "unicode-xid", ] @@ -3867,7 +3990,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "jni-sys", "log", "ndk-sys 0.6.0+11769913", @@ -3903,7 +4026,7 @@ dependencies = [ [[package]] name = "net" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "async-compression", "async-recursion", @@ -3922,10 +4045,12 @@ dependencies = [ "futures-core", "futures-util", "generic-array", - "headers", - "http", - "hyper", + "headers 0.4.0", + "http 1.2.0", + "http-body-util", + "hyper 1.5.2", "hyper-rustls", + "hyper-util", "hyper_serde", "imsz", "ipc-channel", @@ -3939,6 +4064,7 @@ dependencies = [ "rayon", "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "servo_allocator", @@ -3947,11 +4073,12 @@ dependencies = [ "servo_malloc_size_of", "servo_url", "sha2", - "time 0.3.36", + "time 0.3.37", "tokio", "tokio-rustls", "tokio-stream", "tokio-util", + "tower-service", "tungstenite", "url", "uuid", @@ -3963,16 +4090,17 @@ dependencies = [ [[package]] name = "net_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "content-security-policy", "cookie 0.18.1", "crossbeam-channel", "embedder_traits", - "headers", - "http", - "hyper", + "headers 0.4.0", + "http 1.2.0", + "hyper 1.5.2", + "hyper-util", "hyper_serde", "ipc-channel", "log", @@ -3981,7 +4109,7 @@ dependencies = [ "num-traits", "percent-encoding", "pixels", - "rustls", + "rustls-pki-types", "serde", "servo_arc", "servo_malloc_size_of", @@ -4004,7 +4132,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "cfg-if", "cfg_aliases", "libc", @@ -4054,7 +4182,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -4115,7 +4243,7 @@ dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -4170,7 +4298,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "block2", "libc", "objc2", @@ -4186,7 +4314,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "block2", "objc2", "objc2-core-location", @@ -4210,7 +4338,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "block2", "objc2", "objc2-foundation", @@ -4252,7 +4380,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "block2", "dispatch", "libc", @@ -4277,7 +4405,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "block2", "objc2", "objc2-foundation", @@ -4289,7 +4417,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "block2", "objc2", "objc2-foundation", @@ -4312,7 +4440,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "block2", "objc2", "objc2-cloud-kit", @@ -4344,7 +4472,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "block2", "objc2", "objc2-core-location", @@ -4405,6 +4533,15 @@ dependencies = [ "libredox", ] +[[package]] +name = "ordered-float" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" +dependencies = [ + "num-traits", +] + [[package]] name = "ordermap" version = "0.3.5" @@ -4463,7 +4600,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.7", + "redox_syscall 0.5.8", "smallvec", "windows-targets 0.52.6", ] @@ -4509,7 +4646,7 @@ source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62 dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "synstructure", "unicode-xid", ] @@ -4532,22 +4669,22 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ "phf_macros", - "phf_shared 0.11.2", + "phf_shared 0.11.3", ] [[package]] name = "phf_codegen" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", + "phf_generator 0.11.3", + "phf_shared 0.11.3", ] [[package]] @@ -4562,25 +4699,25 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ - "phf_shared 0.11.2", + "phf_shared 0.11.3", "rand", ] [[package]] name = "phf_macros" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", + "phf_generator 0.11.3", + "phf_shared 0.11.3", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -4589,43 +4726,43 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] name = "phf_shared" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ - "siphasher", + "siphasher 1.0.1", ] [[package]] name = "pin-project" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -4636,7 +4773,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pixels" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "euclid", "image 0.24.9", @@ -4778,9 +4915,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -4788,7 +4925,7 @@ dependencies = [ [[package]] name = "profile" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "ipc-channel", @@ -4800,13 +4937,13 @@ dependencies = [ "servo_config", "task_info", "tikv-jemalloc-sys", - "time 0.3.36", + "time 0.3.37", ] [[package]] name = "profile_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "crossbeam-channel", @@ -4815,7 +4952,7 @@ dependencies = [ "serde", "servo_config", "signpost", - "time 0.3.36", + "time 0.3.37", ] [[package]] @@ -4893,7 +5030,7 @@ dependencies = [ [[package]] name = "range" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "malloc_size_of_derive", "num-traits", @@ -4959,11 +5096,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", ] [[package]] @@ -4991,7 +5128,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax", ] @@ -5006,9 +5143,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -5043,7 +5180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.6.0", + "bitflags 2.7.0", "serde", "serde_derive", ] @@ -5077,11 +5214,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "errno", "libc", "linux-raw-sys", @@ -5090,35 +5227,51 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" dependencies = [ "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.21.7", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + [[package]] name = "ryu" version = "1.0.18" @@ -5149,7 +5302,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "script" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "aes", "aes-gcm", @@ -5162,7 +5315,7 @@ dependencies = [ "base", "base64 0.22.1", "bincode", - "bitflags 2.6.0", + "bitflags 2.7.0", "bluetooth_traits", "canvas_traits", "cbc", @@ -5187,9 +5340,9 @@ dependencies = [ "fonts_traits", "fxhash", "glow", - "headers", + "headers 0.4.0", "html5ever", - "http", + "http 1.2.0", "hyper_serde", "image 0.24.9", "indexmap", @@ -5215,7 +5368,7 @@ dependencies = [ "percent-encoding", "phf", "phf_codegen", - "phf_shared 0.11.2", + "phf_shared 0.11.3", "pixels", "profile_traits", "range", @@ -5242,7 +5395,7 @@ dependencies = [ "swapper", "tempfile", "tendril", - "time 0.3.36", + "time 0.3.37", "timers", "unicode-bidi", "unicode-segmentation", @@ -5259,7 +5412,7 @@ dependencies = [ [[package]] name = "script_layout_interface" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "app_units", "atomic_refcell", @@ -5294,11 +5447,11 @@ dependencies = [ [[package]] name = "script_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "background_hang_monitor_api", "base", - "bitflags 2.6.0", + "bitflags 2.7.0", "bluetooth_traits", "canvas_traits", "cookie 0.18.1", @@ -5306,7 +5459,7 @@ dependencies = [ "devtools_traits", "embedder_traits", "euclid", - "http", + "http 1.2.0", "hyper_serde", "ipc-channel", "keyboard-types", @@ -5330,16 +5483,6 @@ dependencies = [ "webxr-api", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sctk-adwaita" version = "0.10.1" @@ -5356,9 +5499,9 @@ dependencies = [ [[package]] name = "selectors" version = "0.26.0" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "cssparser", "derive_more", "fxhash", @@ -5405,14 +5548,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -5495,7 +5638,7 @@ source = "git+https://github.com/servo/media#5f4c4066cb4793179adcfd678be63328de8 dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -5552,7 +5695,7 @@ dependencies = [ [[package]] name = "servo_allocator" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -5563,7 +5706,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.0" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "serde", "stable_deref_trait", @@ -5572,7 +5715,7 @@ dependencies = [ [[package]] name = "servo_atoms" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "string_cache", "string_cache_codegen", @@ -5581,7 +5724,7 @@ dependencies = [ [[package]] name = "servo_config" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "dirs", "embedder_traits", @@ -5601,18 +5744,18 @@ dependencies = [ [[package]] name = "servo_config_plugins" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "servo_geometry" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "app_units", "euclid", @@ -5624,7 +5767,7 @@ dependencies = [ [[package]] name = "servo_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "accountable-refcell", "app_units", @@ -5632,7 +5775,7 @@ dependencies = [ "crossbeam-channel", "dom", "euclid", - "http", + "http 1.2.0", "indexmap", "keyboard-types", "malloc_size_of", @@ -5655,7 +5798,7 @@ dependencies = [ [[package]] name = "servo_rand" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "log", "malloc_size_of_derive", @@ -5669,7 +5812,7 @@ dependencies = [ [[package]] name = "servo_url" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "malloc_size_of_derive", "serde", @@ -5728,7 +5871,7 @@ checksum = "8e7e46c8c90251d47d08b28b8a419ffb4aede0f87c2eea95e17d1d5bacbf3ef1" dependencies = [ "colored", "log", - "time 0.3.36", + "time 0.3.37", "windows-sys 0.48.0", ] @@ -5738,6 +5881,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.9" @@ -5777,7 +5926,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "calloop", "calloop-wayland-source", "cursor-icon", @@ -5842,7 +5991,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", ] [[package]] @@ -5860,7 +6009,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "static_prefs" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" [[package]] name = "strck" @@ -5910,15 +6059,37 @@ dependencies = [ "quote", ] +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.96", +] + [[package]] name = "style" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "app_units", "arrayvec", "atomic_refcell", - "bitflags 2.6.0", + "bitflags 2.7.0", "byteorder", "cssparser", "derive_more", @@ -5971,7 +6142,7 @@ dependencies = [ [[package]] name = "style_config" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "lazy_static", ] @@ -5979,22 +6150,22 @@ dependencies = [ [[package]] name = "style_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] [[package]] name = "style_traits" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "app_units", - "bitflags 2.6.0", + "bitflags 2.7.0", "cssparser", "euclid", "lazy_static", @@ -6021,7 +6192,7 @@ name = "surfman" version = "0.9.8" source = "git+https://github.com/servo/surfman?rev=300789ddbda45c89e9165c31118bf1c4c07f89f6#300789ddbda45c89e9165c31118bf1c4c07f89f6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "cfg_aliases", "cgl", "cocoa", @@ -6074,9 +6245,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.94" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -6091,7 +6262,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -6109,9 +6280,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ee7dc8eeb09b5952509850485cf7e73b81af1a4cd5d71f2ee34ed2aa0c562a" +checksum = "944a2a0b6070d217b69afb819f65f84ba093c43d627571fdac1c46f03a14d326" dependencies = [ "arrayvec", "grid", @@ -6139,7 +6310,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "task_info" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "cc", ] @@ -6196,11 +6367,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.11", ] [[package]] @@ -6211,18 +6382,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -6269,9 +6440,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -6292,9 +6463,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -6309,7 +6480,7 @@ checksum = "06535c958d6abe68dc4b4ef9e6845f758fc42fe463d0093d0aca40254f03fb14" [[package]] name = "timers" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "crossbeam-channel", @@ -6357,7 +6528,7 @@ dependencies = [ [[package]] name = "to_shmem" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "cssparser", "servo_arc", @@ -6370,20 +6541,20 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-12-04#098f1bef3e231bbf86038c0a2b1ddc31031dc422" +source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -6397,20 +6568,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ "rustls", "tokio", @@ -6546,21 +6717,21 @@ checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 1.2.0", "httparse", "log", "rand", "rustls", + "rustls-pki-types", "sha1", "thiserror 1.0.69", - "url", "utf-8", ] @@ -6670,9 +6841,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -6706,9 +6877,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" dependencies = [ "getrandom", "serde", @@ -6765,7 +6936,7 @@ dependencies = [ "gleam", "glutin", "glutin-winit", - "headers", + "headers 0.4.0", "ipc-channel", "keyboard-types", "layout_thread_2020", @@ -6781,6 +6952,7 @@ dependencies = [ "profile", "profile_traits", "raw-window-handle", + "rustls", "script", "script_traits", "serde", @@ -6847,9 +7019,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "headers", - "http", - "hyper", + "headers 0.3.9", + "http 0.2.12", + "hyper 0.14.32", "log", "mime", "mime_guess", @@ -6879,35 +7051,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.47" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", @@ -6918,9 +7090,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6928,22 +7100,25 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "wayland-backend" @@ -6965,7 +7140,7 @@ version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "rustix", "wayland-backend", "wayland-scanner", @@ -6977,7 +7152,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "cursor-icon", "wayland-backend", ] @@ -6999,7 +7174,7 @@ version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -7011,7 +7186,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7024,7 +7199,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7068,9 +7243,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.74" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -7095,14 +7270,14 @@ dependencies = [ "base64 0.21.7", "bytes", "cookie 0.16.2", - "http", + "http 0.2.12", "icu_segmenter", "log", "serde", "serde_derive", "serde_json", "thiserror 1.0.69", - "time 0.3.36", + "time 0.3.37", "tokio", "tokio-stream", "url", @@ -7112,7 +7287,7 @@ dependencies = [ [[package]] name = "webdriver_server" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "base64 0.22.1", @@ -7120,7 +7295,7 @@ dependencies = [ "cookie 0.18.1", "crossbeam-channel", "euclid", - "http", + "http 0.2.12", "image 0.24.9", "ipc-channel", "keyboard-types", @@ -7140,7 +7315,7 @@ dependencies = [ [[package]] name = "webgpu" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "arrayvec", "base", @@ -7159,9 +7334,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "webrender" @@ -7169,7 +7347,7 @@ version = "0.65.0" source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "bincode", - "bitflags 2.6.0", + "bitflags 2.7.0", "build-parallel", "byteorder", "derive_more", @@ -7204,7 +7382,7 @@ version = "0.65.0" source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "app_units", - "bitflags 2.6.0", + "bitflags 2.7.0", "byteorder", "crossbeam-channel", "euclid", @@ -7222,14 +7400,14 @@ name = "webrender_build" version = "0.0.2" source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "lazy_static", ] [[package]] name = "webrender_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=dd9164f#dd9164f49a3f53bd4567687b009da6df9ffd11ed" +source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" dependencies = [ "base", "embedder_traits", @@ -7263,11 +7441,11 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu-core" version = "23.0.1" -source = "git+https://github.com/gfx-rs/wgpu?rev=0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93#0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93" +source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.6.0", + "bitflags 2.7.0", "cfg_aliases", "document-features", "indexmap", @@ -7279,7 +7457,7 @@ dependencies = [ "rustc-hash 1.1.0", "serde", "smallvec", - "thiserror 2.0.9", + "thiserror 2.0.11", "wgpu-hal", "wgpu-types", ] @@ -7287,13 +7465,13 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "23.0.1" -source = "git+https://github.com/gfx-rs/wgpu?rev=0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93#0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93" +source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.6.0", + "bitflags 2.7.0", "block", "bytemuck", "cfg_aliases", @@ -7313,13 +7491,14 @@ dependencies = [ "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", + "ordered-float", "parking_lot", "profiling", "range-alloc", "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 2.0.9", + "thiserror 2.0.11", "wasm-bindgen", "web-sys", "wgpu-types", @@ -7330,9 +7509,9 @@ dependencies = [ [[package]] name = "wgpu-types" version = "23.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93#0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93" +source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "js-sys", "serde", "web-sys", @@ -7409,7 +7588,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -7420,7 +7599,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -7658,14 +7837,14 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.30.7" +version = "0.30.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba50bc8ef4b6f1a75c9274fb95aa9a8f63fbc66c56f391bd85cf68d51e7b1a3" +checksum = "f5d74280aabb958072864bff6cfbcf9025cf8bfacdde5e32b5e12920ef703b0f" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.6.0", + "bitflags 2.7.0", "block2", "bytemuck", "calloop", @@ -7819,9 +7998,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xattr" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909" dependencies = [ "libc", "linux-raw-sys", @@ -7846,7 +8025,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "dlib", "log", "once_cell", @@ -7861,9 +8040,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.24" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432" +checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4" [[package]] name = "xml5ever" @@ -7907,7 +8086,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] @@ -7929,7 +8108,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -7949,10 +8128,16 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + [[package]] name = "zerotrie" version = "0.1.3" @@ -7983,7 +8168,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fbb537bb..bf22900c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,38 +65,39 @@ ipc-channel = { workspace = true } keyboard-types = "0.7" log = "0.4" raw-window-handle = { version = "0.6", features = ["std"] } +rustls = { version = "0.23", default-features = false, features = ["ring"] } sparkle = "0.1.26" thiserror = "1.0" winit = { version = "0.30", features = ["rwh_06"] } # Servo repo crates -base = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -bluetooth = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -bluetooth_traits = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -canvas = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -compositing_traits = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -constellation = { git = "https://github.com/servo/servo.git", rev = "dd9164f", features = ["webgpu"] } -devtools = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -embedder_traits = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -fonts = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -layout_thread_2020 = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -media = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -net = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -net_traits = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -profile = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -profile_traits = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -script = { git = "https://github.com/servo/servo.git", rev = "dd9164f", features = ["webgpu"] } -script_traits = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -servo_config = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -servo_geometry = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -servo_url = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -webdriver_server = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -webrender_traits = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } -webgpu = { git = "https://github.com/servo/servo.git", rev = "dd9164f" } +base = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +bluetooth = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +bluetooth_traits = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +canvas = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +compositing_traits = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +constellation = { git = "https://github.com/servo/servo.git", rev = "90c5685", features = ["webgpu"] } +devtools = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +embedder_traits = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +fonts = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +layout_thread_2020 = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +media = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +net = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +net_traits = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +profile = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +profile_traits = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +script = { git = "https://github.com/servo/servo.git", rev = "90c5685", features = ["webgpu"] } +script_traits = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +servo_config = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +servo_geometry = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +servo_url = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +webdriver_server = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +webrender_traits = { git = "https://github.com/servo/servo.git", rev = "90c5685" } +webgpu = { git = "https://github.com/servo/servo.git", rev = "90c5685" } # Servo org crates servo-media = { git = "https://github.com/servo/media" } servo-media-dummy = { git = "https://github.com/servo/media" } -style = { git = "https://github.com/servo/stylo", branch = "2024-12-04", features = ["servo"] } -style_traits = { git = "https://github.com/servo/stylo", branch = "2024-12-04", features = ["servo"] } +style = { git = "https://github.com/servo/stylo", branch = "2025-01-02", features = ["servo"] } +style_traits = { git = "https://github.com/servo/stylo", branch = "2025-01-02", features = ["servo"] } webrender = { git = "https://github.com/servo/webrender", branch = "0.65", features = ["capture"] } webrender_api = { git = "https://github.com/servo/webrender", branch = "0.65" } # Packager feature @@ -104,7 +105,7 @@ cargo-packager-resource-resolver = { version = "0.1.1", features = [ "auto-detect-format", ], optional = true } url = { workspace = true } -headers = "0.3" +headers = "0.4" versoview_messages = { path = "./versoview_messages" } serde_json = "1.0" serde = { workspace = true } diff --git a/src/main.rs b/src/main.rs index 20001b64..854f644e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -47,6 +47,8 @@ impl ApplicationHandler for App { } fn main() -> Result<()> { + init_crypto(); + let event_loop = EventLoop::::with_user_event().build()?; event_loop.listen_device_events(DeviceEvents::Never); let proxy = event_loop.create_proxy(); @@ -55,3 +57,9 @@ fn main() -> Result<()> { Ok(()) } + +fn init_crypto() { + rustls::crypto::ring::default_provider() + .install_default() + .expect("Error initializing crypto provider"); +} diff --git a/src/verso.rs b/src/verso.rs index 50dea602..97bec865 100644 --- a/src/verso.rs +++ b/src/verso.rs @@ -339,20 +339,18 @@ impl Verso { }; // Create constellation thread - let constellation_sender = Constellation::< - script::script_thread::ScriptThread, - script::serviceworker_manager::ServiceWorkerManager, - >::start( - initial_state, - layout_factory, - window_size, - opts.random_pipeline_closure_probability, - opts.random_pipeline_closure_seed, - opts.hard_fail, - !opts.debug.disable_canvas_antialiasing, - canvas_create_sender, - canvas_ipc_sender, - ); + let constellation_sender = + Constellation::::start( + initial_state, + layout_factory, + window_size, + opts.random_pipeline_closure_probability, + opts.random_pipeline_closure_seed, + opts.hard_fail, + !opts.debug.disable_canvas_antialiasing, + canvas_create_sender, + canvas_ipc_sender, + ); // Create webdriver thread if let Some(port) = opts.webdriver_port {