From ecefa75e4730fe5d713fccfc5f6948ff1cd79fd7 Mon Sep 17 00:00:00 2001 From: DK Liao Date: Mon, 2 Sep 2024 12:30:36 +0800 Subject: [PATCH] chore: Update servo to 35ca050 (#174) * Update servo to 35ca050 * Update Cargo.lock * Update Cargo.lock --- Cargo.lock | 239 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 44 +++++----- 2 files changed, 138 insertions(+), 145 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e25304..a4dcbc9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -245,7 +245,7 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "background_hang_monitor" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "background_hang_monitor_api", "backtrace", @@ -263,7 +263,7 @@ dependencies = [ [[package]] name = "background_hang_monitor_api" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "ipc-channel", @@ -293,7 +293,7 @@ dependencies = [ [[package]] name = "base" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "crossbeam-channel", "ipc-channel", @@ -329,7 +329,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.10.5", "lazy_static", "lazycell", "proc-macro2", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "bluetooth" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "bitflags 2.6.0", "bluetooth_traits", @@ -420,7 +420,7 @@ dependencies = [ [[package]] name = "bluetooth_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "embedder_traits", "ipc-channel", @@ -483,9 +483,9 @@ checksum = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -544,7 +544,7 @@ dependencies = [ [[package]] name = "canvas" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "app_units", "bitflags 2.6.0", @@ -583,7 +583,7 @@ dependencies = [ [[package]] name = "canvas_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "crossbeam-channel", @@ -691,9 +691,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.8.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +checksum = "a483f3cbf7cec2e153d424d0e92329d816becc6421389bd494375c6065921b9b" dependencies = [ "glob", "libc", @@ -778,7 +778,7 @@ dependencies = [ [[package]] name = "compositing_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "crossbeam-channel", @@ -808,7 +808,7 @@ dependencies = [ [[package]] name = "constellation" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "background_hang_monitor", "background_hang_monitor_api", @@ -1052,16 +1052,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" -[[package]] -name = "d3d12" -version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=781b54a8b9cee1a2cb22bda565662edec52eb70e#781b54a8b9cee1a2cb22bda565662edec52eb70e" -dependencies = [ - "bitflags 2.6.0", - "libloading", - "winapi", -] - [[package]] name = "darling" version = "0.20.10" @@ -1111,7 +1101,7 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "deny_public_fields" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "syn", "synstructure", @@ -1124,13 +1114,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", ] [[package]] name = "derive_common" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "darling", "proc-macro2", @@ -1153,7 +1142,7 @@ dependencies = [ [[package]] name = "devtools" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "chrono", @@ -1175,7 +1164,7 @@ dependencies = [ [[package]] name = "devtools_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "bitflags 2.6.0", @@ -1294,7 +1283,7 @@ dependencies = [ [[package]] name = "dom" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "bitflags 2.6.0", ] @@ -1302,7 +1291,7 @@ dependencies = [ [[package]] name = "dom_struct" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "quote", "syn", @@ -1311,7 +1300,7 @@ dependencies = [ [[package]] name = "domobject_derive" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "proc-macro2", "quote", @@ -1347,9 +1336,9 @@ dependencies = [ [[package]] name = "dwrote" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" dependencies = [ "lazy_static", "libc", @@ -1368,7 +1357,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedder_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "cfg-if", @@ -1459,9 +1448,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.10" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" dependencies = [ "num-traits", "serde", @@ -1500,9 +1489,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", @@ -1587,7 +1576,7 @@ dependencies = [ [[package]] name = "fonts" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "app_units", "atomic_refcell", @@ -1639,7 +1628,7 @@ dependencies = [ [[package]] name = "fonts_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "ipc-channel", "malloc_size_of", @@ -1946,9 +1935,9 @@ dependencies = [ [[package]] name = "glslopt" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee5be629003d587bab188f3e2e3b010aa2cde7c41ec967b3a244f388d4d81877" +checksum = "913662ae8335df058d56e00f11340b20fa82e03e0276587797ef325ab01e50d4" dependencies = [ "cc", ] @@ -2038,6 +2027,18 @@ dependencies = [ "bitflags 2.6.0", ] +[[package]] +name = "gpu-allocator" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +dependencies = [ + "log", + "presser", + "thiserror", + "windows 0.58.0", +] + [[package]] name = "gpu-descriptor" version = "0.3.0" @@ -2272,7 +2273,7 @@ dependencies = [ [[package]] name = "hyper_serde" version = "0.13.2" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "cookie 0.18.1", "headers", @@ -2281,8 +2282,6 @@ dependencies = [ "mime", "serde", "serde_bytes", - "time 0.1.45", - "time 0.3.36", ] [[package]] @@ -2840,15 +2839,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -2916,7 +2906,7 @@ dependencies = [ [[package]] name = "jstraceable_derive" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "proc-macro2", "syn", @@ -2954,7 +2944,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "layout_2020" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "app_units", "atomic_refcell", @@ -2990,7 +2980,6 @@ dependencies = [ "style_traits", "unicode-bidi", "unicode-script", - "unicode-segmentation", "url", "webrender_api", "webrender_traits", @@ -3000,7 +2989,7 @@ dependencies = [ [[package]] name = "layout_thread_2020" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "app_units", "base", @@ -3119,7 +3108,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.1", ] [[package]] @@ -3206,7 +3195,7 @@ dependencies = [ [[package]] name = "malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "accountable-refcell", "app_units", @@ -3269,7 +3258,7 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "media" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "euclid", "fnv", @@ -3329,7 +3318,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "fonts_traits", @@ -3452,7 +3441,7 @@ dependencies = [ [[package]] name = "naga" version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=781b54a8b9cee1a2cb22bda565662edec52eb70e#781b54a8b9cee1a2cb22bda565662edec52eb70e" +source = "git+https://github.com/gfx-rs/wgpu?rev=34bb9e4ceb45a5b1cfc5df6aa2b2e201cc55372c#34bb9e4ceb45a5b1cfc5df6aa2b2e201cc55372c" dependencies = [ "arrayvec", "bit-set", @@ -3512,7 +3501,7 @@ dependencies = [ [[package]] name = "net" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "async-recursion", "async-tungstenite", @@ -3558,7 +3547,6 @@ dependencies = [ "servo_url", "sha2", "time 0.1.45", - "time 0.3.36", "tokio", "tokio-rustls", "tokio-stream", @@ -3573,7 +3561,7 @@ dependencies = [ [[package]] name = "net_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "content-security-policy", @@ -3982,9 +3970,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -4043,7 +4031,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.1", "smallvec", "windows-targets 0.52.6", ] @@ -4076,7 +4064,7 @@ dependencies = [ [[package]] name = "peek-poke" version = "0.3.0" -source = "git+https://github.com/servo/webrender?branch=0.65#c0bcdd024adac1297ceb2f34a2de46731243c970" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "euclid", "peek-poke-derive", @@ -4085,7 +4073,7 @@ dependencies = [ [[package]] name = "peek-poke-derive" version = "0.3.0" -source = "git+https://github.com/servo/webrender?branch=0.65#c0bcdd024adac1297ceb2f34a2de46731243c970" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "proc-macro2", "quote", @@ -4225,7 +4213,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pixels" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "euclid", "image 0.24.9", @@ -4303,6 +4291,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -4324,7 +4318,7 @@ dependencies = [ [[package]] name = "profile" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "ipc-channel", "libc", @@ -4340,7 +4334,7 @@ dependencies = [ [[package]] name = "profile_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "crossbeam-channel", "ipc-channel", @@ -4426,7 +4420,7 @@ dependencies = [ [[package]] name = "range" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "malloc_size_of", "malloc_size_of_derive", @@ -4491,9 +4485,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ "bitflags 2.6.0", ] @@ -4600,18 +4594,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -4690,7 +4684,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "script" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "app_units", "arrayvec", @@ -4791,7 +4785,7 @@ dependencies = [ [[package]] name = "script_layout_interface" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "app_units", "atomic_refcell", @@ -4826,7 +4820,7 @@ dependencies = [ [[package]] name = "script_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "background_hang_monitor_api", "base", @@ -4856,7 +4850,6 @@ dependencies = [ "servo_url", "smallvec", "style_traits", - "time 0.1.45", "uuid", "webdriver", "webgpu", @@ -4897,7 +4890,7 @@ checksum = "0495e4577c672de8254beb68d01a9b62d0e8a13c099edecdbedccce3223cd29f" [[package]] name = "selectors" version = "0.24.0" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "bitflags 2.6.0", "cssparser", @@ -5110,7 +5103,7 @@ dependencies = [ [[package]] name = "servo_allocator" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -5121,7 +5114,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.2.0" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "serde", "stable_deref_trait", @@ -5130,7 +5123,7 @@ dependencies = [ [[package]] name = "servo_atoms" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "string_cache", "string_cache_codegen", @@ -5139,7 +5132,7 @@ dependencies = [ [[package]] name = "servo_config" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "dirs", "embedder_traits", @@ -5159,7 +5152,7 @@ dependencies = [ [[package]] name = "servo_config_plugins" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "itertools 0.13.0", "proc-macro2", @@ -5170,7 +5163,7 @@ dependencies = [ [[package]] name = "servo_geometry" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "app_units", "euclid", @@ -5182,7 +5175,7 @@ dependencies = [ [[package]] name = "servo_rand" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "log", "rand", @@ -5194,7 +5187,7 @@ dependencies = [ [[package]] name = "servo_url" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "malloc_size_of", "malloc_size_of_derive", @@ -5266,7 +5259,7 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "size_of_test" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "static_assertions", ] @@ -5396,7 +5389,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "static_prefs" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" [[package]] name = "strck" @@ -5449,7 +5442,7 @@ dependencies = [ [[package]] name = "style" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "app_units", "arrayvec", @@ -5508,7 +5501,7 @@ dependencies = [ [[package]] name = "style_config" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "lazy_static", ] @@ -5516,7 +5509,7 @@ dependencies = [ [[package]] name = "style_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "darling", "derive_common", @@ -5529,7 +5522,7 @@ dependencies = [ [[package]] name = "style_traits" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "app_units", "bitflags 2.6.0", @@ -5642,7 +5635,7 @@ dependencies = [ [[package]] name = "task_info" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "cc", ] @@ -5841,7 +5834,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "cssparser", "servo_arc", @@ -5854,7 +5847,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#3359447b53f0d0bc4affe135313ca8d0e48cb876" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" dependencies = [ "darling", "derive_common", @@ -5866,9 +5859,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -6532,7 +6525,7 @@ dependencies = [ [[package]] name = "webdriver_server" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "base64", @@ -6560,7 +6553,7 @@ dependencies = [ [[package]] name = "webgpu" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "arrayvec", "base", @@ -6587,7 +6580,7 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webrender" version = "0.65.0" -source = "git+https://github.com/servo/webrender?branch=0.65#c0bcdd024adac1297ceb2f34a2de46731243c970" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "bincode", "bitflags 2.6.0", @@ -6622,7 +6615,7 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.65.0" -source = "git+https://github.com/servo/webrender?branch=0.65#c0bcdd024adac1297ceb2f34a2de46731243c970" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "app_units", "bitflags 2.6.0", @@ -6641,7 +6634,7 @@ dependencies = [ [[package]] name = "webrender_build" version = "0.0.2" -source = "git+https://github.com/servo/webrender?branch=0.65#c0bcdd024adac1297ceb2f34a2de46731243c970" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "bitflags 2.6.0", "lazy_static", @@ -6650,7 +6643,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=bb5926b#bb5926b3291877fb47d44ea376881c2d52701bbf" +source = "git+https://github.com/servo/servo.git?rev=35ca050#35ca050bfb82b27cac0fe142768a4876759fced0" dependencies = [ "base", "crossbeam-channel", @@ -6667,7 +6660,7 @@ dependencies = [ [[package]] name = "webxr" version = "0.0.1" -source = "git+https://github.com/servo/webxr#06cf8102e1ee7954e4ea1e5a08a905dda60e35cd" +source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" dependencies = [ "crossbeam-channel", "euclid", @@ -6681,7 +6674,7 @@ dependencies = [ [[package]] name = "webxr-api" version = "0.0.1" -source = "git+https://github.com/servo/webxr#06cf8102e1ee7954e4ea1e5a08a905dda60e35cd" +source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" dependencies = [ "euclid", "ipc-channel", @@ -6698,7 +6691,7 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu-core" version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=781b54a8b9cee1a2cb22bda565662edec52eb70e#781b54a8b9cee1a2cb22bda565662edec52eb70e" +source = "git+https://github.com/gfx-rs/wgpu?rev=34bb9e4ceb45a5b1cfc5df6aa2b2e201cc55372c#34bb9e4ceb45a5b1cfc5df6aa2b2e201cc55372c" dependencies = [ "arrayvec", "bit-vec", @@ -6723,7 +6716,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=781b54a8b9cee1a2cb22bda565662edec52eb70e#781b54a8b9cee1a2cb22bda565662edec52eb70e" +source = "git+https://github.com/gfx-rs/wgpu?rev=34bb9e4ceb45a5b1cfc5df6aa2b2e201cc55372c#34bb9e4ceb45a5b1cfc5df6aa2b2e201cc55372c" dependencies = [ "android_system_properties", "arrayvec", @@ -6733,10 +6726,10 @@ dependencies = [ "block", "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12", "glow", "glutin_wgl_sys", "gpu-alloc", + "gpu-allocator", "gpu-descriptor", "js-sys", "khronos-egl", @@ -6758,14 +6751,14 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "winapi", "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] name = "wgpu-types" version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=781b54a8b9cee1a2cb22bda565662edec52eb70e#781b54a8b9cee1a2cb22bda565662edec52eb70e" +source = "git+https://github.com/gfx-rs/wgpu?rev=34bb9e4ceb45a5b1cfc5df6aa2b2e201cc55372c#34bb9e4ceb45a5b1cfc5df6aa2b2e201cc55372c" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -7185,7 +7178,7 @@ dependencies = [ [[package]] name = "wr_glyph_rasterizer" version = "0.1.0" -source = "git+https://github.com/servo/webrender?branch=0.65#c0bcdd024adac1297ceb2f34a2de46731243c970" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "core-foundation", "core-graphics", @@ -7210,7 +7203,7 @@ dependencies = [ [[package]] name = "wr_malloc_size_of" version = "0.0.3" -source = "git+https://github.com/servo/webrender?branch=0.65#c0bcdd024adac1297ceb2f34a2de46731243c970" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "app_units", "euclid", @@ -7292,9 +7285,9 @@ checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xi-unicode" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xkbcommon-dl" diff --git a/Cargo.toml b/Cargo.toml index 0c70c3b..db6db4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,28 +63,28 @@ 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 = "bb5926b" } -bluetooth = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -bluetooth_traits = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -canvas = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -compositing_traits = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -constellation = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -devtools = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -embedder_traits = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -fonts = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -layout_thread_2020 = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -media = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -net = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -profile = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -profile_traits = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -script = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -script_traits = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -servo_config = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -servo_geometry = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -servo_url = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -webdriver_server = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -webrender_traits = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } -webgpu = { git = "https://github.com/servo/servo.git", rev = "bb5926b" } +base = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +bluetooth = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +bluetooth_traits = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +canvas = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +compositing_traits = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +constellation = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +devtools = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +embedder_traits = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +fonts = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +layout_thread_2020 = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +media = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +net = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +profile = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +profile_traits = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +script = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +script_traits = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +servo_config = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +servo_geometry = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +servo_url = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +webdriver_server = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +webrender_traits = { git = "https://github.com/servo/servo.git", rev = "35ca050" } +webgpu = { git = "https://github.com/servo/servo.git", rev = "35ca050" } # Servo org crates servo-media = { git = "https://github.com/servo/media" } servo-media-dummy = { git = "https://github.com/servo/media" }