Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

servoshell: Update gilrs version, enable gamepad pref by default (#33466)

Browse source 
* Update gilrs version, enable pref by default

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Add core-foundation to servo-tidy ignore

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Update manifest

Signed-off-by: Daniel Adams <msub2official@gmail.com>

---------

Signed-off-by: Daniel Adams <msub2official@gmail.com>
This commit is contained in:
Daniel Adams 2024-09-17 05:52:19 +00:00 • committed by GitHub
parent f8e0fde044
commit 4c3b3529a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 44 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Cargo.lock generated
View file

@ -805,7 +805,7 @@ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"block", "block",
"cocoa-foundation", "cocoa-foundation",
"core-foundation", "core-foundation 0.9.4",
"core-graphics", "core-graphics",
"foreign-types 0.5.0", "foreign-types 0.5.0",
"libc", "libc",
@ -820,7 +820,7 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"block", "block",
"core-foundation", "core-foundation 0.9.4",
"core-graphics-types", "core-graphics-types",
"libc", "libc",
"objc", "objc",
@ -1048,6 +1048,16 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "core-foundation"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]] [[package]]
name = "core-foundation-sys" name = "core-foundation-sys"
version = "0.8.7" version = "0.8.7"
@ -1061,7 +1071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"core-foundation", "core-foundation 0.9.4",
"core-graphics-types", "core-graphics-types",
"foreign-types 0.5.0", "foreign-types 0.5.0",
"libc", "libc",
@ -1074,7 +1084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"core-foundation", "core-foundation 0.9.4",
"libc", "libc",
] ]
@ -1084,7 +1094,7 @@ version = "20.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
dependencies = [ dependencies = [
"core-foundation", "core-foundation 0.9.4",
"core-graphics", "core-graphics",
"foreign-types 0.5.0", "foreign-types 0.5.0",
"libc", "libc",
@ -1858,7 +1868,7 @@ checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"byteorder", "byteorder",
"core-foundation", "core-foundation 0.9.4",
"core-graphics", "core-graphics",
"core-text", "core-text",
"dirs", "dirs",
@ -1884,7 +1894,7 @@ dependencies = [
"base", "base",
"bitflags 2.6.0", "bitflags 2.6.0",
"byteorder", "byteorder",
"core-foundation", "core-foundation 0.9.4",
"core-graphics", "core-graphics",
"core-text", "core-text",
"crossbeam-channel", "crossbeam-channel",
@ -2199,8 +2209,9 @@ dependencies = [
[[package]] [[package]]
name = "gilrs" name = "gilrs"
version = "0.10.6" version = "0.11.0"
source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbb2c998745a3c1ac90f64f4f7b3a54219fd3612d7705e7798212935641ed18f"
dependencies = [ dependencies = [
"fnv", "fnv",
"gilrs-core", "gilrs-core",
@ -2211,10 +2222,11 @@ dependencies = [
[[package]] [[package]]
name = "gilrs-core" name = "gilrs-core"
version = "0.5.12" version = "0.6.0"
source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "495af945e45efd6386227613cd9fb7bd7c43d3c095040e30c5304c489e6abed5"
dependencies = [ dependencies = [
"core-foundation", "core-foundation 0.10.0",
"inotify", "inotify",
"io-kit-sys", "io-kit-sys",
"js-sys", "js-sys",
@ -2226,7 +2238,7 @@ dependencies = [
"vec_map", "vec_map",
"wasm-bindgen", "wasm-bindgen",
"web-sys", "web-sys",
"windows 0.48.0", "windows 0.58.0",
] ]
[[package]] [[package]]
@ -3511,11 +3523,11 @@ dependencies = [
[[package]] [[package]]
name = "inotify" name = "inotify"
version = "0.10.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 2.6.0",
"inotify-sys", "inotify-sys",
"libc", "libc",
] ]
@ -3546,7 +3558,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "861c6093cbc05599e66436aedf380bb0a23cec2180738393d3a340b80dd135ef" checksum = "861c6093cbc05599e66436aedf380bb0a23cec2180738393d3a340b80dd135ef"
dependencies = [ dependencies = [
"cgl", "cgl",
"core-foundation", "core-foundation 0.9.4",
"leaky-cow", "leaky-cow",
"libc", "libc",
] ]
@ -6739,7 +6751,7 @@ dependencies = [
"cfg_aliases 0.2.1", "cfg_aliases 0.2.1",
"cgl", "cgl",
"cocoa", "cocoa",
"core-foundation", "core-foundation 0.9.4",
"core-graphics", "core-graphics",
"euclid", "euclid",
"fnv", "fnv",
@ -8436,7 +8448,7 @@ dependencies = [
"bytemuck", "bytemuck",
"calloop", "calloop",
"cfg_aliases 0.1.1", "cfg_aliases 0.1.1",
"core-foundation", "core-foundation 0.9.4",
"core-graphics", "core-graphics",
"cursor-icon", "cursor-icon",
"icrate", "icrate",
@ -8503,7 +8515,7 @@ name = "wr_glyph_rasterizer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76"
dependencies = [ dependencies = [
"core-foundation", "core-foundation 0.9.4",
"core-graphics", "core-graphics",
"core-text", "core-text",
"dwrote", "dwrote",

2
ports/servoshell/Cargo.toml
View file

@ -105,7 +105,7 @@ egui = { version = "0.28.1" }
egui_glow = { version = "0.28.1", features = ["winit"] } egui_glow = { version = "0.28.1", features = ["winit"] }
egui-winit = { version = "0.28.1", default-features = false, features = ["clipboard", "wayland"] } egui-winit = { version = "0.28.1", default-features = false, features = ["clipboard", "wayland"] }
euclid = { workspace = true } euclid = { workspace = true }
gilrs = { git = "https://gitlab.com/gilrs-project/gilrs", rev = "eafb7f2ef488874188c5d75adce9aef486be9d4e" } gilrs = "0.11.0"
gleam = { workspace = true } gleam = { workspace = true }
glow = "0.13.1" glow = "0.13.1"
headers = { workspace = true } headers = { workspace = true }

2
resources/prefs.json
View file

@ -12,7 +12,7 @@
"dom.document.dblclick_timeout": 300, "dom.document.dblclick_timeout": 300,
"dom.forcetouch.enabled": false, "dom.forcetouch.enabled": false,
"dom.fullscreen.test": false, "dom.fullscreen.test": false,
"dom.gamepad.enabled": false, "dom.gamepad.enabled": true,
"dom.imagebitmap.enabled": false, "dom.imagebitmap.enabled": false,
"dom.microdata.enabled": false, "dom.microdata.enabled": false,
"dom.microdata.testing.enabled": false, "dom.microdata.testing.enabled": false,

3
servo-tidy.toml
View file

@ -76,6 +76,9 @@ packages = [
# icu_list -> regex-automata 0.2.0 # icu_list -> regex-automata 0.2.0
# tracing-subscriber -> matchers -> regex-automata 0.1.0 # tracing-subscriber -> matchers -> regex-automata 0.1.0
"regex-automata", "regex-automata",
# gilrs is on 0.10.0, but Servo is still on 0.9.4
"core-foundation",
] ]
# Files that are ignored for all tidy and lint checks. # Files that are ignored for all tidy and lint checks.
files = [ files = [

2
tests/wpt/mozilla/meta/MANIFEST.json vendored
View file

@ -13495,7 +13495,7 @@
] ]
], ],
"interfaces.html": [ "interfaces.html": [
"086bc095b078efdcac4f51ef314f7851793dbb53", "94f1102da478919d2948ebb96f81450f5d545635",
[ [
null, null,
{} {}

6
tests/wpt/mozilla/tests/mozilla/interfaces.html vendored
View file

@ -90,6 +90,12 @@ test_interfaces([
"FormData", "FormData",
"FormDataEvent", "FormDataEvent",
"GainNode", "GainNode",
"Gamepad",
"GamepadButton",
"GamepadButtonList",
"GamepadEvent",
"GamepadHapticActuator",
"GamepadPose",
"HashChangeEvent", "HashChangeEvent",
"Headers", "Headers",
"History", "History",