From 09252a50f607f8d0ca04ad4e876d9fb70ed0d9d6 Mon Sep 17 00:00:00 2001 From: DK Liao Date: Mon, 2 Dec 2024 09:40:57 +0800 Subject: [PATCH 1/3] update servo to 7489e3d --- Cargo.lock | 113 +++++++++++++++++++++-------------------------------- Cargo.toml | 46 +++++++++++----------- 2 files changed, 67 insertions(+), 92 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 99723623..8d420ef0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -363,7 +363,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "background_hang_monitor" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "background_hang_monitor_api", "backtrace", @@ -381,15 +381,11 @@ dependencies = [ [[package]] name = "background_hang_monitor_api" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "ipc-channel", - "malloc_size_of_derive", - "parking_lot", "serde", - "servo_malloc_size_of", - "webrender_api", ] [[package]] @@ -410,7 +406,7 @@ dependencies = [ [[package]] name = "base" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "crossbeam-channel", "ipc-channel", @@ -534,7 +530,7 @@ dependencies = [ [[package]] name = "bluetooth" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "bitflags 2.6.0", "bluetooth_traits", @@ -550,7 +546,7 @@ dependencies = [ [[package]] name = "bluetooth_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "embedder_traits", "ipc-channel", @@ -699,7 +695,7 @@ dependencies = [ [[package]] name = "canvas" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "app_units", "bitflags 2.6.0", @@ -718,14 +714,11 @@ dependencies = [ "lyon_geom", "net_traits", "num-traits", - "parking_lot", - "pathfinder_geometry", "pixels", "range", "raqote", "servo_arc", "style", - "style_traits", "surfman", "unicode-script", "webrender", @@ -736,7 +729,7 @@ dependencies = [ [[package]] name = "canvas_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "crossbeam-channel", @@ -967,13 +960,12 @@ dependencies = [ [[package]] name = "compositing_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "crossbeam-channel", "embedder_traits", "euclid", - "fonts_traits", "ipc-channel", "keyboard-types", "log", @@ -997,7 +989,7 @@ dependencies = [ [[package]] name = "constellation" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "background_hang_monitor", "background_hang_monitor_api", @@ -1011,7 +1003,6 @@ dependencies = [ "embedder_traits", "euclid", "fonts", - "fonts_traits", "gaol", "http", "ipc-channel", @@ -1300,7 +1291,7 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "deny_public_fields" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "syn 2.0.89", "synstructure", @@ -1330,7 +1321,7 @@ dependencies = [ [[package]] name = "devtools" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "chrono", @@ -1353,7 +1344,7 @@ dependencies = [ [[package]] name = "devtools_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "bitflags 2.6.0", @@ -1481,7 +1472,7 @@ dependencies = [ [[package]] name = "dom_struct" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "quote", "syn 2.0.89", @@ -1490,7 +1481,7 @@ dependencies = [ [[package]] name = "domobject_derive" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "proc-macro2", "quote", @@ -1547,7 +1538,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedder_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "cfg-if", @@ -1775,7 +1766,7 @@ dependencies = [ [[package]] name = "fonts" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "app_units", "atomic_refcell", @@ -1786,7 +1777,6 @@ dependencies = [ "core-graphics", "core-text", "crossbeam-channel", - "cssparser", "dwrote", "euclid", "fnv", @@ -1813,15 +1803,12 @@ dependencies = [ "servo_url", "smallvec", "style", - "surfman", "truetype", - "unicode-bidi", "unicode-properties", "unicode-script", "url", "webrender_api", "webrender_traits", - "xi-unicode", "xml-rs", "yeslogic-fontconfig-sys", ] @@ -1829,14 +1816,12 @@ dependencies = [ [[package]] name = "fonts_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ - "ipc-channel", "malloc_size_of_derive", "range", "serde", "servo_malloc_size_of", - "webrender_api", ] [[package]] @@ -2714,7 +2699,7 @@ dependencies = [ [[package]] name = "hyper_serde" version = "0.13.2" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "cookie 0.18.1", "headers", @@ -3372,7 +3357,7 @@ dependencies = [ [[package]] name = "jstraceable_derive" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "proc-macro2", "syn 2.0.89", @@ -3410,7 +3395,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "layout_2020" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "app_units", "atomic_refcell", @@ -3435,7 +3420,6 @@ dependencies = [ "range", "rayon", "script_layout_interface", - "script_traits", "serde", "serde_json", "servo_arc", @@ -3456,7 +3440,7 @@ dependencies = [ [[package]] name = "layout_thread_2020" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "app_units", "base", @@ -3706,7 +3690,7 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "media" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "euclid", "fnv", @@ -3714,7 +3698,6 @@ dependencies = [ "log", "serde", "servo-media", - "servo_config", "webrender_api", "webrender_traits", ] @@ -3775,10 +3758,9 @@ dependencies = [ [[package]] name = "metrics" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", - "fonts_traits", "ipc-channel", "log", "malloc_size_of_derive", @@ -3970,7 +3952,7 @@ dependencies = [ [[package]] name = "net" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "async-compression", "async-recursion", @@ -4001,7 +3983,6 @@ dependencies = [ "mime", "mime_guess", "net_traits", - "percent-encoding", "pixels", "profile_traits", "rayon", @@ -4031,7 +4012,7 @@ dependencies = [ [[package]] name = "net_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "content-security-policy", @@ -4042,7 +4023,6 @@ dependencies = [ "http", "hyper", "hyper_serde", - "image 0.24.9", "ipc-channel", "log", "malloc_size_of_derive", @@ -4058,7 +4038,6 @@ dependencies = [ "servo_url", "url", "uuid", - "webrender_api", "webrender_traits", ] @@ -4706,7 +4685,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pixels" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "euclid", "image 0.24.9", @@ -4858,7 +4837,7 @@ dependencies = [ [[package]] name = "profile" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "ipc-channel", @@ -4876,7 +4855,7 @@ dependencies = [ [[package]] name = "profile_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "crossbeam-channel", @@ -4963,7 +4942,7 @@ dependencies = [ [[package]] name = "range" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "malloc_size_of_derive", "num-traits", @@ -5213,7 +5192,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "script" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "aes", "aes-gcm", @@ -5321,7 +5300,7 @@ dependencies = [ [[package]] name = "script_layout_interface" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "app_units", "atomic_refcell", @@ -5344,7 +5323,6 @@ dependencies = [ "selectors", "serde", "servo_arc", - "servo_atoms", "servo_malloc_size_of", "servo_url", "style", @@ -5356,7 +5334,7 @@ dependencies = [ [[package]] name = "script_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "background_hang_monitor_api", "base", @@ -5368,7 +5346,6 @@ dependencies = [ "devtools_traits", "embedder_traits", "euclid", - "fonts_traits", "http", "hyper_serde", "ipc-channel", @@ -5384,7 +5361,6 @@ dependencies = [ "servo_atoms", "servo_malloc_size_of", "servo_url", - "smallvec", "style_traits", "uuid", "webdriver", @@ -5616,7 +5592,7 @@ dependencies = [ [[package]] name = "servo_allocator" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -5645,7 +5621,7 @@ dependencies = [ [[package]] name = "servo_config" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "dirs", "embedder_traits", @@ -5665,7 +5641,7 @@ dependencies = [ [[package]] name = "servo_config_plugins" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "itertools 0.13.0", "proc-macro2", @@ -5676,7 +5652,7 @@ dependencies = [ [[package]] name = "servo_geometry" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "app_units", "euclid", @@ -5688,7 +5664,7 @@ dependencies = [ [[package]] name = "servo_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "accountable-refcell", "app_units", @@ -5700,6 +5676,7 @@ dependencies = [ "indexmap", "keyboard-types", "malloc_size_of", + "markup5ever", "serde", "serde_bytes", "servo_allocator", @@ -5713,13 +5690,12 @@ dependencies = [ "uuid", "webrender_api", "wr_malloc_size_of", - "xml5ever", ] [[package]] name = "servo_rand" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "log", "malloc_size_of_derive", @@ -5733,7 +5709,7 @@ dependencies = [ [[package]] name = "servo_url" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "malloc_size_of_derive", "serde", @@ -6205,7 +6181,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "task_info" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "cc", ] @@ -7141,7 +7117,7 @@ dependencies = [ [[package]] name = "webdriver_server" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", "base64", @@ -7169,7 +7145,7 @@ dependencies = [ [[package]] name = "webgpu" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "arrayvec", "base", @@ -7258,10 +7234,9 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.0.1" -source = "git+https://github.com/servo/servo.git?rev=c11e0e8#c11e0e8e706f565c4cd0e80ddfbf210d7660fbb6" +source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "base", - "crossbeam-channel", "embedder_traits", "euclid", "ipc-channel", diff --git a/Cargo.toml b/Cargo.toml index 698156d7..5f852afe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,29 +69,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 = "c11e0e8" } -bluetooth = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -bluetooth_traits = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -canvas = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -compositing_traits = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -constellation = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -devtools = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -embedder_traits = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -fonts = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -layout_thread_2020 = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -media = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -net = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -net_traits = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -profile = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -profile_traits = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -script = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -script_traits = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -servo_config = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -servo_geometry = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -servo_url = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -webdriver_server = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -webrender_traits = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } -webgpu = { git = "https://github.com/servo/servo.git", rev = "c11e0e8" } +base = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +bluetooth = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +bluetooth_traits = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +canvas = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +compositing_traits = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +constellation = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +devtools = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +embedder_traits = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +fonts = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +layout_thread_2020 = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +media = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +net = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +net_traits = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +profile = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +profile_traits = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +script = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +script_traits = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +servo_config = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +servo_geometry = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +servo_url = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +webdriver_server = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +webrender_traits = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } +webgpu = { git = "https://github.com/servo/servo.git", rev = "7489e3d" } # Servo org crates servo-media = { git = "https://github.com/servo/media" } servo-media-dummy = { git = "https://github.com/servo/media" } From 67798449410d945ae117f5f53172513116a9dfe9 Mon Sep 17 00:00:00 2001 From: DK Liao Date: Mon, 2 Dec 2024 09:54:23 +0800 Subject: [PATCH 2/3] Update Cargo.lock --- Cargo.lock | 210 ++++++++++++++++++++++++++--------------------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8d420ef0..3d331a96 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -125,9 +125,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-activity" @@ -300,7 +300,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -454,7 +454,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.89", + "syn 2.0.90", "which", ] @@ -627,9 +627,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cairo-rs" @@ -779,9 +779,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "jobserver", "libc", @@ -1214,7 +1214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1224,7 +1224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1262,7 +1262,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1273,7 +1273,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1293,7 +1293,7 @@ name = "deny_public_fields" version = "0.0.1" source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -1315,7 +1315,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1377,7 +1377,7 @@ dependencies = [ "diplomat_core", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1401,7 +1401,7 @@ dependencies = [ "serde", "smallvec", "strck_ident", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1439,7 +1439,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1463,7 +1463,7 @@ dependencies = [ [[package]] name = "dom" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "bitflags 2.6.0", "malloc_size_of", @@ -1475,7 +1475,7 @@ version = "0.0.1" source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1485,7 +1485,7 @@ source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b0949 dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1611,12 +1611,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1862,7 +1862,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1973,7 +1973,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2235,7 +2235,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2470,7 +2470,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2613,7 +2613,7 @@ dependencies = [ "markup5ever", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3104,7 +3104,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3216,9 +3216,9 @@ checksum = "76a49eaebc8750bcba241df1e1e47ebb51b81eb35c65e8f11ffa0aebac353f7f" [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -3301,9 +3301,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jni" @@ -3347,10 +3347,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -3360,7 +3361,7 @@ version = "0.0.1" source = "git+https://github.com/servo/servo.git?rev=7489e3d#7489e3d5f48191b09490a58f1b52b09ed7aa9fbe" dependencies = [ "proc-macro2", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -3508,15 +3509,15 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -3642,7 +3643,7 @@ dependencies = [ [[package]] name = "malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "app_units", "cssparser", @@ -3663,7 +3664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f44db74bde26fdf427af23f1d146c211aed857c59e3be750cf2617f6b0b05c94" dependencies = [ "proc-macro2", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -3815,11 +3816,10 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", @@ -4103,7 +4103,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4164,7 +4164,7 @@ dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4558,7 +4558,7 @@ source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62 dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", "unicode-xid", ] @@ -4629,7 +4629,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4667,7 +4667,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -5396,7 +5396,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.26.0" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "bitflags 2.6.0", "cssparser", @@ -5445,7 +5445,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -5535,7 +5535,7 @@ source = "git+https://github.com/servo/media#12dfb35619520eb6e78e25e9a975d625f64 dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -5603,7 +5603,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.0" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "serde", "stable_deref_trait", @@ -5612,7 +5612,7 @@ dependencies = [ [[package]] name = "servo_atoms" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "string_cache", "string_cache_codegen", @@ -5646,7 +5646,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -5847,9 +5847,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5900,7 +5900,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "static_prefs" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" [[package]] name = "strck" @@ -5953,7 +5953,7 @@ dependencies = [ [[package]] name = "style" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "app_units", "arrayvec", @@ -6011,7 +6011,7 @@ dependencies = [ [[package]] name = "style_config" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "lazy_static", ] @@ -6019,19 +6019,19 @@ dependencies = [ [[package]] name = "style_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] [[package]] name = "style_traits" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "app_units", "bitflags 2.6.0", @@ -6048,7 +6048,6 @@ dependencies = [ "to_shmem", "to_shmem_derive", "url", - "webrender_api", ] [[package]] @@ -6115,9 +6114,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -6132,7 +6131,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -6243,7 +6242,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -6365,7 +6364,7 @@ dependencies = [ [[package]] name = "to_shmem" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "cssparser", "servo_arc", @@ -6378,12 +6377,12 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-11-01#639802f35677f444a66fa1cf01bb579065cb2a27" +source = "git+https://github.com/servo/stylo?branch=2024-11-01#16c1b6858581ab837f04a30cc5bc762ca1cbad23" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -6411,7 +6410,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -6507,9 +6506,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -6518,9 +6517,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -6548,9 +6547,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e" +checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" [[package]] name = "tungstenite" @@ -6886,9 +6885,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" dependencies = [ "cfg-if", "once_cell", @@ -6897,36 +6896,37 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6934,22 +6934,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" [[package]] name = "wayland-backend" @@ -7074,9 +7074,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" dependencies = [ "js-sys", "wasm-bindgen", @@ -7267,9 +7267,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu-core" -version = "23.0.0" +version = "23.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0c68e7b6322a03ee5b83fcd92caeac5c2a932f6457818179f4652ad2a9c065" +checksum = "d63c3c478de8e7e01786479919c8769f62a22eec16788d8c2ac77ce2c132778a" dependencies = [ "arrayvec", "bit-vec", @@ -7293,9 +7293,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "23.0.0" +version = "23.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de6e7266b869de56c7e3ed72a954899f71d14fec6cc81c102b7530b92947601b" +checksum = "89364b8a0b211adc7b16aeaf1bd5ad4a919c1154b44c9ce27838213ba05fd821" dependencies = [ "android_system_properties", "arrayvec", @@ -7430,7 +7430,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -7441,7 +7441,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -7928,7 +7928,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -7950,7 +7950,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -7970,7 +7970,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -8004,7 +8004,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] From aba08647bdc0cbe1cf35c27d03f2e1c627a94183 Mon Sep 17 00:00:00 2001 From: DK Liao Date: Mon, 2 Dec 2024 09:54:54 +0800 Subject: [PATCH 3/3] use `webrender_api::units::DevicePixel` instead of `style_traits::DevicePixel` --- src/compositor.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/compositor.rs b/src/compositor.rs index 8599205f..c03cd209 100644 --- a/src/compositor.rs +++ b/src/compositor.rs @@ -25,19 +25,13 @@ use script_traits::{ ScrollState, TouchEventType, TouchId, WheelDelta, WindowSizeData, WindowSizeType, }; use servo_geometry::{DeviceIndependentIntSize, DeviceIndependentPixel}; -use style_traits::{CSSPixel, DevicePixel, PinchZoomFactor}; +use style_traits::{CSSPixel, PinchZoomFactor}; use webrender::{RenderApi, Transaction}; use webrender_api::units::{ - DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePoint, LayoutPoint, LayoutRect, LayoutSize, - LayoutVector2D, WorldPoint, + DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePixel, DevicePoint, LayoutPoint, LayoutRect, LayoutSize, LayoutVector2D, WorldPoint }; use webrender_api::{ - BorderRadius, BoxShadowClipMode, BuiltDisplayList, ClipMode, ColorF, CommonItemProperties, - ComplexClipRegion, DirtyRect, DisplayListPayload, DocumentId, Epoch as WebRenderEpoch, - ExternalScrollId, FontInstanceFlags, FontInstanceKey, FontInstanceOptions, FontKey, - HitTestFlags, PipelineId as WebRenderPipelineId, PropertyBinding, ReferenceFrameKind, - RenderReasons, SampledScrollOffset, ScrollLocation, SpaceAndClipInfo, SpatialId, - SpatialTreeItemKey, TransformStyle, + BorderRadius, BoxShadowClipMode, BuiltDisplayList, ClipMode, ColorF, CommonItemProperties, ComplexClipRegion, DirtyRect, DisplayListPayload, DocumentId, Epoch as WebRenderEpoch, ExternalScrollId, FontInstanceFlags, FontInstanceKey, FontInstanceOptions, FontKey, HitTestFlags, PipelineId as WebRenderPipelineId, PropertyBinding, ReferenceFrameKind, RenderReasons, SampledScrollOffset, ScrollLocation, SpaceAndClipInfo, SpatialId, SpatialTreeItemKey, TransformStyle }; use webrender_traits::display_list::{HitTestInfo, ScrollTree}; use webrender_traits::{