diff --git a/Cargo.lock b/Cargo.lock index 49070ed..f0674e0 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.7.0", + "bitflags 2.8.0", "cc", "cesu8", "jni", @@ -206,11 +206,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] @@ -361,7 +362,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "background_hang_monitor" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "background_hang_monitor_api", "backtrace", @@ -379,7 +380,7 @@ dependencies = [ [[package]] name = "background_hang_monitor_api" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "ipc-channel", @@ -404,7 +405,7 @@ dependencies = [ [[package]] name = "base" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "crossbeam-channel", "ipc-channel", @@ -447,7 +448,7 @@ version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "cexpr", "clang-sys", "itertools 0.13.0", @@ -488,9 +489,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" dependencies = [ "serde", ] @@ -531,9 +532,9 @@ dependencies = [ [[package]] name = "bluetooth" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "bluetooth_traits", "blurmock", "embedder_traits", @@ -547,7 +548,7 @@ dependencies = [ [[package]] name = "bluetooth_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "embedder_traits", "ipc-channel", @@ -613,6 +614,20 @@ name = "bytemuck" version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] [[package]] name = "byteorder" @@ -638,7 +653,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "cairo-sys-rs", "glib", "libc", @@ -673,7 +688,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "log", "polling", "rustix", @@ -696,10 +711,10 @@ dependencies = [ [[package]] name = "canvas" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "app_units", - "bitflags 2.7.0", + "bitflags 2.8.0", "byteorder", "canvas_traits", "crossbeam-channel", @@ -730,7 +745,7 @@ dependencies = [ [[package]] name = "canvas_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "crossbeam-channel", @@ -780,9 +795,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.9" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" +checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" dependencies = [ "jobserver", "libc", @@ -955,7 +970,7 @@ dependencies = [ [[package]] name = "compositing_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "crossbeam-channel", @@ -984,7 +999,7 @@ dependencies = [ [[package]] name = "constellation" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "background_hang_monitor", "background_hang_monitor_api", @@ -1029,7 +1044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0db809cdd8bf9d875323a8bbb5951d582042a3d279ee861be9cc8f7be24b46f" dependencies = [ "base64 0.22.1", - "bitflags 2.7.0", + "bitflags 2.8.0", "once_cell", "percent-encoding", "regex", @@ -1273,9 +1288,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" [[package]] name = "data-url" @@ -1286,7 +1301,7 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "deny_public_fields" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "syn 2.0.96", "synstructure", @@ -1316,7 +1331,7 @@ dependencies = [ [[package]] name = "devtools" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "chrono", @@ -1339,10 +1354,10 @@ dependencies = [ [[package]] name = "devtools_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", - "bitflags 2.7.0", + "bitflags 2.8.0", "http 1.2.0", "ipc-channel", "malloc_size_of_derive", @@ -1460,14 +1475,14 @@ name = "dom" version = "0.0.1" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "malloc_size_of", ] [[package]] name = "dom_struct" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "quote", "syn 2.0.96", @@ -1476,7 +1491,7 @@ dependencies = [ [[package]] name = "domobject_derive" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "proc-macro2", "quote", @@ -1533,17 +1548,21 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedder_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "cfg-if", "crossbeam-channel", + "http 1.2.0", + "hyper_serde", "ipc-channel", "keyboard-types", "log", + "malloc_size_of_derive", "num-derive", "num-traits", "serde", + "servo_malloc_size_of", "servo_url", "webrender_api", ] @@ -1745,7 +1764,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "byteorder", "core-foundation", "core-graphics", @@ -1767,12 +1786,12 @@ dependencies = [ [[package]] name = "fonts" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "app_units", "atomic_refcell", "base", - "bitflags 2.7.0", + "bitflags 2.8.0", "byteorder", "core-foundation", "core-graphics", @@ -1817,7 +1836,7 @@ dependencies = [ [[package]] name = "fonts_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "malloc_size_of_derive", "range", @@ -2208,7 +2227,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "futures-channel", "futures-core", "futures-executor", @@ -2282,7 +2301,7 @@ version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03642b8b0cce622392deb0ee3e88511f75df2daac806102597905c3ea1974848" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "cfg_aliases", "cgl", "core-foundation", @@ -2359,7 +2378,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "gpu-alloc-types", ] @@ -2369,7 +2388,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", ] [[package]] @@ -2390,7 +2409,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "gpu-descriptor-types", "hashbrown", ] @@ -2401,7 +2420,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", ] [[package]] @@ -2708,9 +2727,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.32" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -2791,7 +2810,7 @@ dependencies = [ [[package]] name = "hyper_serde" version = "0.13.2" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "cookie 0.18.1", "headers 0.4.0", @@ -3429,9 +3448,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" dependencies = [ "once_cell", "wasm-bindgen", @@ -3440,7 +3459,7 @@ dependencies = [ [[package]] name = "jstraceable_derive" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "proc-macro2", "syn 2.0.96", @@ -3453,7 +3472,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "serde", "unicode-segmentation", ] @@ -3478,12 +3497,12 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "layout_2020" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "app_units", "atomic_refcell", "base", - "bitflags 2.7.0", + "bitflags 2.8.0", "canvas_traits", "data-url", "embedder_traits", @@ -3504,8 +3523,6 @@ dependencies = [ "rayon", "script_layout_interface", "selectors", - "serde", - "serde_json", "servo_arc", "servo_config", "servo_geometry", @@ -3524,7 +3541,7 @@ dependencies = [ [[package]] name = "layout_thread_2020" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "app_units", "base", @@ -3612,9 +3629,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "libc", - "redox_syscall 0.5.8", + "redox_syscall 0.5.7", ] [[package]] @@ -3678,9 +3695,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "lyon_geom" @@ -3768,7 +3785,7 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "media" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "euclid", "fnv", @@ -3820,10 +3837,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.30.0" -source = "git+https://github.com/gfx-rs/metal-rs.git?rev=ef768ff9d7#ef768ff9d742ae6a0f4e83ddc8031264e7d460c4" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3835,7 +3853,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "ipc-channel", @@ -3882,9 +3900,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", "simd-adler32", @@ -3965,12 +3983,12 @@ dependencies = [ [[package]] name = "naga" -version = "23.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d" +version = "24.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=779261e64daa6cf76c826532b7a1561d8ec203fd#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.7.0", + "bitflags 2.8.0", "cfg_aliases", "codespan-reporting", "hexf-parse", @@ -3980,7 +3998,7 @@ dependencies = [ "spirv", "strum", "termcolor", - "thiserror 2.0.11", + "thiserror 2.0.9", "unicode-xid", ] @@ -3990,7 +4008,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "jni-sys", "log", "ndk-sys 0.6.0+11769913", @@ -4026,7 +4044,7 @@ dependencies = [ [[package]] name = "net" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "async-compression", "async-recursion", @@ -4090,7 +4108,7 @@ dependencies = [ [[package]] name = "net_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "content-security-policy", @@ -4132,7 +4150,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "cfg-if", "cfg_aliases", "libc", @@ -4298,7 +4316,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "block2", "libc", "objc2", @@ -4314,7 +4332,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-core-location", @@ -4338,7 +4356,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-foundation", @@ -4380,7 +4398,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "block2", "dispatch", "libc", @@ -4405,7 +4423,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-foundation", @@ -4417,7 +4435,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-foundation", @@ -4440,7 +4458,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-cloud-kit", @@ -4472,7 +4490,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-core-location", @@ -4600,7 +4618,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.8", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -4669,12 +4687,12 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.3", + "phf_shared 0.11.2", ] [[package]] @@ -4683,8 +4701,8 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", + "phf_generator 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -4699,11 +4717,11 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.3", + "phf_shared 0.11.2", "rand", ] @@ -4713,8 +4731,8 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", + "phf_generator 0.11.2", + "phf_shared 0.11.2", "proc-macro2", "quote", "syn 2.0.96", @@ -4726,16 +4744,16 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher 0.3.11", + "siphasher", ] [[package]] name = "phf_shared" -version = "0.11.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher 1.0.1", + "siphasher", ] [[package]] @@ -4773,7 +4791,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pixels" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "euclid", "image 0.24.9", @@ -4925,7 +4943,7 @@ dependencies = [ [[package]] name = "profile" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "ipc-channel", @@ -4943,7 +4961,7 @@ dependencies = [ [[package]] name = "profile_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "crossbeam-channel", @@ -5030,7 +5048,7 @@ dependencies = [ [[package]] name = "range" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "malloc_size_of_derive", "num-traits", @@ -5096,11 +5114,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.8" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", ] [[package]] @@ -5128,7 +5146,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", + "regex-automata 0.4.8", "regex-syntax", ] @@ -5143,9 +5161,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -5180,7 +5198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.7.0", + "bitflags 2.8.0", "serde", "serde_derive", ] @@ -5218,7 +5236,7 @@ version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "errno", "libc", "linux-raw-sys", @@ -5302,7 +5320,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "script" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "aes", "aes-gcm", @@ -5315,7 +5333,7 @@ dependencies = [ "base", "base64 0.22.1", "bincode", - "bitflags 2.7.0", + "bitflags 2.8.0", "bluetooth_traits", "canvas_traits", "cbc", @@ -5368,7 +5386,7 @@ dependencies = [ "percent-encoding", "phf", "phf_codegen", - "phf_shared 0.11.3", + "phf_shared 0.11.2", "pixels", "profile_traits", "range", @@ -5412,7 +5430,7 @@ dependencies = [ [[package]] name = "script_layout_interface" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "app_units", "atomic_refcell", @@ -5447,11 +5465,11 @@ dependencies = [ [[package]] name = "script_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "background_hang_monitor_api", "base", - "bitflags 2.7.0", + "bitflags 2.8.0", "bluetooth_traits", "canvas_traits", "cookie 0.18.1", @@ -5501,7 +5519,7 @@ name = "selectors" version = "0.26.0" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "cssparser", "derive_more", "fxhash", @@ -5600,7 +5618,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#5f4c4066cb4793179adcfd678be63328de8ccbda" +source = "git+https://github.com/servo/media#1ff67581bceada8680396cff5520587c669eac83" dependencies = [ "once_cell", "servo-media-audio", @@ -5613,7 +5631,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.2.0" -source = "git+https://github.com/servo/media#5f4c4066cb4793179adcfd678be63328de8ccbda" +source = "git+https://github.com/servo/media#1ff67581bceada8680396cff5520587c669eac83" dependencies = [ "byte-slice-cast", "euclid", @@ -5634,7 +5652,7 @@ dependencies = [ [[package]] name = "servo-media-derive" version = "0.1.0" -source = "git+https://github.com/servo/media#5f4c4066cb4793179adcfd678be63328de8ccbda" +source = "git+https://github.com/servo/media#1ff67581bceada8680396cff5520587c669eac83" dependencies = [ "proc-macro2", "quote", @@ -5644,7 +5662,7 @@ dependencies = [ [[package]] name = "servo-media-dummy" version = "0.1.0" -source = "git+https://github.com/servo/media#5f4c4066cb4793179adcfd678be63328de8ccbda" +source = "git+https://github.com/servo/media#1ff67581bceada8680396cff5520587c669eac83" dependencies = [ "ipc-channel", "servo-media", @@ -5658,7 +5676,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#5f4c4066cb4793179adcfd678be63328de8ccbda" +source = "git+https://github.com/servo/media#1ff67581bceada8680396cff5520587c669eac83" dependencies = [ "ipc-channel", "serde", @@ -5670,7 +5688,7 @@ dependencies = [ [[package]] name = "servo-media-streams" version = "0.1.0" -source = "git+https://github.com/servo/media#5f4c4066cb4793179adcfd678be63328de8ccbda" +source = "git+https://github.com/servo/media#1ff67581bceada8680396cff5520587c669eac83" dependencies = [ "lazy_static", "uuid", @@ -5679,12 +5697,12 @@ dependencies = [ [[package]] name = "servo-media-traits" version = "0.1.0" -source = "git+https://github.com/servo/media#5f4c4066cb4793179adcfd678be63328de8ccbda" +source = "git+https://github.com/servo/media#1ff67581bceada8680396cff5520587c669eac83" [[package]] name = "servo-media-webrtc" version = "0.1.0" -source = "git+https://github.com/servo/media#5f4c4066cb4793179adcfd678be63328de8ccbda" +source = "git+https://github.com/servo/media#1ff67581bceada8680396cff5520587c669eac83" dependencies = [ "lazy_static", "log", @@ -5695,7 +5713,7 @@ dependencies = [ [[package]] name = "servo_allocator" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -5724,38 +5742,33 @@ dependencies = [ [[package]] name = "servo_config" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ - "dirs", - "embedder_traits", "euclid", - "getopts", "log", - "num_cpus", "serde", "serde_json", - "servo_config_plugins", + "servo_config_macro", "servo_geometry", "servo_url", "style_config", - "url", ] [[package]] -name = "servo_config_plugins" +name = "servo_config_macro" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ - "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.96", + "synstructure", ] [[package]] name = "servo_geometry" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "app_units", "euclid", @@ -5767,7 +5780,7 @@ dependencies = [ [[package]] name = "servo_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "accountable-refcell", "app_units", @@ -5798,7 +5811,7 @@ dependencies = [ [[package]] name = "servo_rand" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "log", "malloc_size_of_derive", @@ -5812,7 +5825,7 @@ dependencies = [ [[package]] name = "servo_url" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "malloc_size_of_derive", "serde", @@ -5881,12 +5894,6 @@ 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" @@ -5926,7 +5933,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "calloop", "calloop-wayland-source", "cursor-icon", @@ -5991,7 +5998,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.7.0", + "bitflags 2.8.0", ] [[package]] @@ -6089,7 +6096,7 @@ dependencies = [ "app_units", "arrayvec", "atomic_refcell", - "bitflags 2.7.0", + "bitflags 2.8.0", "byteorder", "cssparser", "derive_more", @@ -6165,7 +6172,7 @@ version = "0.0.1" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970" dependencies = [ "app_units", - "bitflags 2.7.0", + "bitflags 2.8.0", "cssparser", "euclid", "lazy_static", @@ -6192,7 +6199,7 @@ name = "surfman" version = "0.9.8" source = "git+https://github.com/servo/surfman?rev=300789ddbda45c89e9165c31118bf1c4c07f89f6#300789ddbda45c89e9165c31118bf1c4c07f89f6" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "cfg_aliases", "cgl", "cocoa", @@ -6310,7 +6317,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "task_info" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "cc", ] @@ -6367,11 +6374,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.11" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl 2.0.9", ] [[package]] @@ -6387,9 +6394,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.11" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", @@ -6480,7 +6487,7 @@ checksum = "06535c958d6abe68dc4b4ef9e6845f758fc42fe463d0093d0aca40254f03fb14" [[package]] name = "timers" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "crossbeam-channel", @@ -6773,9 +6780,6 @@ name = "unicode-bidi" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" -dependencies = [ - "serde", -] [[package]] name = "unicode-ident" @@ -6841,9 +6845,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.4" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" dependencies = [ "form_urlencoded", "idna", @@ -6877,9 +6881,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "getrandom", "serde", @@ -7021,7 +7025,7 @@ dependencies = [ "futures-util", "headers 0.3.9", "http 0.2.12", - "hyper 0.14.32", + "hyper 0.14.30", "log", "mime", "mime_guess", @@ -7051,24 +7055,24 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" dependencies = [ "cfg-if", "once_cell", - "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" dependencies = [ "bumpalo", "log", + "once_cell", "proc-macro2", "quote", "syn 2.0.96", @@ -7077,9 +7081,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" dependencies = [ "cfg-if", "js-sys", @@ -7090,9 +7094,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7100,9 +7104,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" dependencies = [ "proc-macro2", "quote", @@ -7113,12 +7117,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -dependencies = [ - "unicode-ident", -] +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" [[package]] name = "wayland-backend" @@ -7140,7 +7141,7 @@ version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "rustix", "wayland-backend", "wayland-scanner", @@ -7152,7 +7153,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "cursor-icon", "wayland-backend", ] @@ -7174,7 +7175,7 @@ version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -7186,7 +7187,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7199,7 +7200,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7243,9 +7244,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" dependencies = [ "js-sys", "wasm-bindgen", @@ -7287,7 +7288,7 @@ dependencies = [ [[package]] name = "webdriver_server" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "base64 0.22.1", @@ -7315,7 +7316,7 @@ dependencies = [ [[package]] name = "webgpu" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "arrayvec", "base", @@ -7347,7 +7348,7 @@ version = "0.65.0" source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "bincode", - "bitflags 2.7.0", + "bitflags 2.8.0", "build-parallel", "byteorder", "derive_more", @@ -7382,7 +7383,7 @@ version = "0.65.0" source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ "app_units", - "bitflags 2.7.0", + "bitflags 2.8.0", "byteorder", "crossbeam-channel", "euclid", @@ -7400,14 +7401,14 @@ name = "webrender_build" version = "0.0.2" source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "lazy_static", ] [[package]] name = "webrender_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=90c5685#90c5685d61946d489ec8ab54d84980298c12ee09" +source = "git+https://github.com/servo/servo.git?rev=c070372#c070372d1e15c37633b6e17737aab847d8df5fa4" dependencies = [ "base", "embedder_traits", @@ -7440,12 +7441,12 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu-core" -version = "23.0.1" -source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d" +version = "24.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=779261e64daa6cf76c826532b7a1561d8ec203fd#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.7.0", + "bitflags 2.8.0", "cfg_aliases", "document-features", "indexmap", @@ -7457,21 +7458,21 @@ dependencies = [ "rustc-hash 1.1.0", "serde", "smallvec", - "thiserror 2.0.11", + "thiserror 2.0.9", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "23.0.1" -source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d" +version = "24.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=779261e64daa6cf76c826532b7a1561d8ec203fd#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.7.0", + "bitflags 2.8.0", "block", "bytemuck", "cfg_aliases", @@ -7486,7 +7487,7 @@ dependencies = [ "libc", "libloading", "log", - "metal 0.30.0", + "metal 0.31.0", "naga", "ndk-sys 0.5.0+25.2.9519653", "objc", @@ -7498,7 +7499,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 2.0.11", + "thiserror 2.0.9", "wasm-bindgen", "web-sys", "wgpu-types", @@ -7508,11 +7509,12 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "23.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d" +version = "24.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=779261e64daa6cf76c826532b7a1561d8ec203fd#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "js-sys", + "log", "serde", "web-sys", ] @@ -7844,7 +7846,7 @@ dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.7.0", + "bitflags 2.8.0", "block2", "bytemuck", "calloop", @@ -8025,7 +8027,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "dlib", "log", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index bf22900..ff7f93a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,29 +70,29 @@ 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 = "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" } +base = { git = "https://github.com/servo/servo.git", rev = "c070372" } +bluetooth = { git = "https://github.com/servo/servo.git", rev = "c070372" } +bluetooth_traits = { git = "https://github.com/servo/servo.git", rev = "c070372" } +canvas = { git = "https://github.com/servo/servo.git", rev = "c070372" } +compositing_traits = { git = "https://github.com/servo/servo.git", rev = "c070372" } +constellation = { git = "https://github.com/servo/servo.git", rev = "c070372", features = ["webgpu"] } +devtools = { git = "https://github.com/servo/servo.git", rev = "c070372" } +embedder_traits = { git = "https://github.com/servo/servo.git", rev = "c070372" } +fonts = { git = "https://github.com/servo/servo.git", rev = "c070372" } +layout_thread_2020 = { git = "https://github.com/servo/servo.git", rev = "c070372" } +media = { git = "https://github.com/servo/servo.git", rev = "c070372" } +net = { git = "https://github.com/servo/servo.git", rev = "c070372" } +net_traits = { git = "https://github.com/servo/servo.git", rev = "c070372" } +profile = { git = "https://github.com/servo/servo.git", rev = "c070372" } +profile_traits = { git = "https://github.com/servo/servo.git", rev = "c070372" } +script = { git = "https://github.com/servo/servo.git", rev = "c070372", features = ["webgpu"] } +script_traits = { git = "https://github.com/servo/servo.git", rev = "c070372" } +servo_config = { git = "https://github.com/servo/servo.git", rev = "c070372" } +servo_geometry = { git = "https://github.com/servo/servo.git", rev = "c070372" } +servo_url = { git = "https://github.com/servo/servo.git", rev = "c070372" } +webdriver_server = { git = "https://github.com/servo/servo.git", rev = "c070372" } +webrender_traits = { git = "https://github.com/servo/servo.git", rev = "c070372" } +webgpu = { git = "https://github.com/servo/servo.git", rev = "c070372" } # Servo org crates servo-media = { git = "https://github.com/servo/media" } servo-media-dummy = { git = "https://github.com/servo/media" } diff --git a/resources/prefs.json b/resources/prefs.json deleted file mode 100644 index 7e174f9..0000000 --- a/resources/prefs.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "devtools.server.enabled": false, - "devtools.server.port": 0, - "dom.abort_controller.enabled": false, - "dom.allow_scripts_to_close_windows": false, - "dom.bluetooth.enabled": false, - "dom.bluetooth.testing.enabled": false, - "dom.canvas_capture.enabled": false, - "dom.canvas_text.enabled": true, - "dom.compositionevent.enabled": false, - "dom.crypto.subtle.enabled": true, - "dom.customelements.enabled": true, - "dom.document.dblclick_dist": 1, - "dom.document.dblclick_timeout": 300, - "dom.forcetouch.enabled": false, - "dom.fullscreen.test": false, - "dom.gamepad.enabled": false, - "dom.imagebitmap.enabled": false, - "dom.intersection_observer.enabled": false, - "dom.microdata.enabled": false, - "dom.microdata.testing.enabled": false, - "dom.mouseevent.which.enabled": false, - "dom.mutation_observer.enabled": true, - "dom.offscreen_canvas.enabled": false, - "dom.permissions.enabled": false, - "dom.permissions.testing.allowed_in_nonsecure_contexts": false, - "dom.resize_observer.enabled": false, - "dom.script.asynch": true, - "dom.serviceworker.enabled": false, - "dom.serviceworker.timeout_seconds": 60, - "dom.servo_helpers.enabled": false, - "dom.servoparser.async_html_tokenizer.enabled": false, - "dom.shadowdom.enabled": false, - "dom.svg.enabled": false, - "dom.testable_crash.enabled": false, - "dom.testbinding.enabled": false, - "dom.testing.htmlinputelement.select_files.enabled": false, - "dom.webgl2.enabled": false, - "dom.webgpu.enabled": false, - "dom.webgpu.wgpu_backend": "", - "dom.webrtc.enabled": false, - "dom.webrtc.transceiver.enabled": false, - "dom.webvr.enabled": false, - "dom.webvr.event_polling_interval": 500, - "dom.webvr.test": false, - "dom.webvtt.enabled": false, - "dom.webxr.enabled": true, - "dom.webxr.first_person_observer_view": false, - "dom.webxr.glwindow.cubemap": false, - "dom.webxr.glwindow.enabled": true, - "dom.webxr.glwindow.left-right": false, - "dom.webxr.glwindow.red-cyan": false, - "dom.webxr.glwindow.spherical": false, - "dom.webxr.hands.enabled": false, - "dom.webxr.layers.enabled": false, - "dom.webxr.openxr.enabled": false, - "dom.webxr.sessionavailable": false, - "dom.webxr.test": false, - "dom.webxr.unsafe-assume-user-intent": false, - "dom.worklet.timeout_ms": 10, - "dom.xpath.enabled": false, - "gfx.subpixel-text-antialiasing.enabled": true, - "gfx.texture-swizzling.enabled": true, - "js.asmjs.enabled": true, - "js.asyncstack.enabled": false, - "js.baseline_interpreter.enabled": true, - "js.baseline_jit.enabled": true, - "js.baseline_jit.unsafe_eager_compilation.enabled": false, - "js.disable_jit": false, - "js.discard_system_source.enabled": false, - "js.dump_stack_on_debuggee_would_run.enabled": false, - "js.ion.enabled": true, - "js.ion.offthread_compilation.enabled": true, - "js.ion.unsafe_eager_compilation.enabled": false, - "js.mem.gc.allocation_threshold_avoid_interrupt_factor": 100, - "js.mem.gc.allocation_threshold_factor": 100, - "js.mem.gc.allocation_threshold_mb": 30, - "js.mem.gc.compacting.enabled": true, - "js.mem.gc.decommit_threshold_mb": 32, - "js.mem.gc.dynamic_heap_growth.enabled": true, - "js.mem.gc.dynamic_mark_slice.enabled": true, - "js.mem.gc.empty_chunk_count_max": 30, - "js.mem.gc.empty_chunk_count_min": 1, - "js.mem.gc.high_frequency_heap_growth_max": 300, - "js.mem.gc.high_frequency_heap_growth_min": 150, - "js.mem.gc.high_frequency_high_limit_mb": 500, - "js.mem.gc.high_frequency_low_limit_mb": 100, - "js.mem.gc.high_frequency_time_limit_ms": 1000, - "js.mem.gc.incremental.enabled": true, - "js.mem.gc.incremental.slice_ms": 10, - "js.mem.gc.low_frequency_heap_growth": 150, - "js.mem.gc.per_zone.enabled": false, - "js.mem.gc.zeal.frequency": 100, - "js.mem.gc.zeal.level": 0, - "js.mem.max": -1, - "js.native_regex.enabled": true, - "js.offthread_compilation.enabled": true, - "js.parallel_parsing.enabled": true, - "js.shared_memory.enabled": true, - "js.strict.debug.enabled": false, - "js.strict.enabled": false, - "js.throw_on_asmjs_validation_failure.enabled": false, - "js.throw_on_debuggee_would_run.enabled": false, - "js.timers.minimum_duration": 1000, - "js.wasm.baseline.enabled": true, - "js.wasm.enabled": true, - "js.wasm.ion.enabled": true, - "js.werror.enabled": false, - "layout.animations.test.enabled": false, - "layout.columns.enabled": false, - "layout.css.transition-behavior.enabled": true, - "layout.flexbox.enabled": true, - "layout.grid.enabled": false, - "layout.legacy_layout": false, - "layout.tables.enabled": false, - "layout.threads": 3, - "layout.writing-mode.enabled": false, - "media.glvideo.enabled": false, - "media.testing.enabled": false, - "network.enforce_tls.enabled": false, - "network.enforce_tls.localhost": false, - "network.enforce_tls.onion": false, - "network.http-cache.disabled": false, - "network.local_directory_listing.enabled": false, - "network.mime.sniff": false, - "network.tls.ignore_unexpected_eof": false, - "session-history.max-length": 20, - "shell.background-color.rgba": [1.0, 1.0, 1.0, 1.0], - "shell.crash_reporter.enabled": false, - "shell.homepage": "https://servo.org", - "shell.keep_screen_on.enabled": false, - "shell.native-orientation": "both", - "shell.native-titlebar.enabled": true, - "shell.searchpage": "https://duckduckgo.com/html/?q=%s", - "threadpools.async_runtime_workers.max": 6, - "threadpools.fallback_worker_num": 3, - "threadpools.image_cache_workers.max": 4, - "threadpools.resource_workers.max": 4, - "threadpools.webrender_workers.max": 4, - "webgl.testing.context_creation_error": false -} - diff --git a/src/config.rs b/src/config.rs index fe70904..d64c295 100644 --- a/src/config.rs +++ b/src/config.rs @@ -8,7 +8,10 @@ use net_traits::{ response::{Response, ResponseBody}, ResourceFetchTiming, }; -use servo_config::opts::{default_opts, set_options, Opts, OutputOptions}; +use servo_config::{ + opts::{default_opts, set_options, Opts, OutputOptions}, + prefs::Preferences, +}; use winit::{dpi, window::WindowAttributes}; /// Servo time profile settings @@ -32,8 +35,6 @@ pub struct CliArgs { pub no_panel: bool, /// Window settings for the initial winit window pub window_attributes: WindowAttributes, - /// Port number to start a server to listen to remote Firefox devtools connections. 0 for random port. - pub devtools_port: Option, /// Servo time profile settings pub profiler_settings: Option, /// Path to resource directory. If None, Verso will try to get default directory. And if that @@ -70,12 +71,6 @@ fn parse_cli_args() -> Result { "", ); opts.optflag("", "no-panel", "Launch Verso without control panel"); - opts.optopt( - "", - "devtools-port", - "Launch Verso with devtools server enabled and listen to port", - "1234", - ); opts.optopt( "p", "profiler", @@ -152,10 +147,6 @@ fn parse_cli_args() -> Result { let resource_dir = matches.opt_str("resources").map(|r| PathBuf::from(r)); let ipc_channel = matches.opt_str("ipc-channel"); let no_panel = matches.opt_present("no-panel"); - let devtools_port = matches.opt_get::("devtools-port").unwrap_or_else(|e| { - log::error!("Failed to parse devtools-port command line argument: {e}"); - None - }); let profiler_settings = if let Ok(Some(profiler_interval)) = matches.opt_get("profiler") { let profile_output = matches.opt_str("profiler-output-file"); @@ -239,7 +230,6 @@ fn parse_cli_args() -> Result { ipc_channel, no_panel, window_attributes, - devtools_port, profiler_settings, user_agent, zoom_level, @@ -249,14 +239,10 @@ fn parse_cli_args() -> Result { impl Config { /// Create a new configuration for creating Verso instance. pub fn new() -> Self { + servo_config::prefs::set(Preferences::default()); let mut opts = default_opts(); let args = parse_cli_args().unwrap_or_default(); - if let Some(devtools_port) = args.devtools_port { - opts.devtools_server_enabled = true; - opts.devtools_port = devtools_port; - } - if let Some(ref profiler_settings) = args.profiler_settings { opts.time_profiling = Some(profiler_settings.output_options.clone()); opts.time_profiler_trace_path = profiler_settings.trace_path.clone(); diff --git a/src/verso.rs b/src/verso.rs index 97bec86..dc15d78 100644 --- a/src/verso.rs +++ b/src/verso.rs @@ -68,7 +68,7 @@ impl Verso { /// Following threads will be created while initializing Verso based on configurations: /// - Time Profiler: Enabled /// - Memory Profiler: Enabled - /// - DevTools: `Opts::devtools_server_enabled` + /// - DevTools: `pref!(devtools_server_enabled)` /// - Webrender: Enabled /// - WebGL: Disabled /// - WebXR: Disabled @@ -183,9 +183,9 @@ impl Verso { }; // Create dev tools thread - let devtools_sender = if opts.devtools_server_enabled { + let devtools_sender = if pref!(devtools_server_enabled) { Some(devtools::start_server( - opts.devtools_port, + pref!(devtools_server_port) as u16, embedder_sender.clone(), )) } else { @@ -209,16 +209,15 @@ impl Verso { // See: https://github.com/servo/servo/issues/31726 use_optimized_shaders: true, resource_override_path: opts.shaders_dir.clone(), - enable_aa: !opts.debug.disable_text_antialiasing, debug_flags, - precache_flags: if opts.debug.precache_shaders { + precache_flags: if pref!(gfx_precache_shaders) { ShaderPrecacheFlags::FULL_COMPILE } else { ShaderPrecacheFlags::empty() }, - enable_subpixel_aa: pref!(gfx.subpixel_text_antialiasing.enabled) - && !opts.debug.disable_subpixel_text_antialiasing, - allow_texture_swizzling: pref!(gfx.texture_swizzling.enabled), + enable_aa: pref!(gfx_text_antialiasing_enabled), + enable_subpixel_aa: pref!(gfx_subpixel_text_antialiasing_enabled), + allow_texture_swizzling: pref!(gfx_texture_swizzling_enabled), clear_color, ..Default::default() }, @@ -347,7 +346,6 @@ impl Verso { opts.random_pipeline_closure_probability, opts.random_pipeline_closure_seed, opts.hard_fail, - !opts.debug.disable_canvas_antialiasing, canvas_create_sender, canvas_ipc_sender, );