diff --git a/Cargo.lock b/Cargo.lock index 2d3fe920384..4f86b386d4c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -805,7 +805,7 @@ dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation", + "core-foundation 0.9.4", "core-graphics", "foreign-types 0.5.0", "libc", @@ -820,7 +820,7 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation", + "core-foundation 0.9.4", "core-graphics-types", "libc", "objc", @@ -1048,6 +1048,16 @@ dependencies = [ "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]] name = "core-foundation-sys" version = "0.8.7" @@ -1061,7 +1071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "core-graphics-types", "foreign-types 0.5.0", "libc", @@ -1074,7 +1084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "libc", ] @@ -1084,7 +1094,7 @@ version = "20.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", "core-graphics", "foreign-types 0.5.0", "libc", @@ -1858,7 +1868,7 @@ checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520" dependencies = [ "bitflags 2.6.0", "byteorder", - "core-foundation", + "core-foundation 0.9.4", "core-graphics", "core-text", "dirs", @@ -1884,7 +1894,7 @@ dependencies = [ "base", "bitflags 2.6.0", "byteorder", - "core-foundation", + "core-foundation 0.9.4", "core-graphics", "core-text", "crossbeam-channel", @@ -2199,8 +2209,9 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.10.6" -source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb2c998745a3c1ac90f64f4f7b3a54219fd3612d7705e7798212935641ed18f" dependencies = [ "fnv", "gilrs-core", @@ -2211,10 +2222,11 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.5.12" -source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "495af945e45efd6386227613cd9fb7bd7c43d3c095040e30c5304c489e6abed5" dependencies = [ - "core-foundation", + "core-foundation 0.10.0", "inotify", "io-kit-sys", "js-sys", @@ -2226,7 +2238,7 @@ dependencies = [ "vec_map", "wasm-bindgen", "web-sys", - "windows 0.48.0", + "windows 0.58.0", ] [[package]] @@ -3511,11 +3523,11 @@ dependencies = [ [[package]] name = "inotify" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "inotify-sys", "libc", ] @@ -3546,7 +3558,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "861c6093cbc05599e66436aedf380bb0a23cec2180738393d3a340b80dd135ef" dependencies = [ "cgl", - "core-foundation", + "core-foundation 0.9.4", "leaky-cow", "libc", ] @@ -6739,7 +6751,7 @@ dependencies = [ "cfg_aliases 0.2.1", "cgl", "cocoa", - "core-foundation", + "core-foundation 0.9.4", "core-graphics", "euclid", "fnv", @@ -8436,7 +8448,7 @@ dependencies = [ "bytemuck", "calloop", "cfg_aliases 0.1.1", - "core-foundation", + "core-foundation 0.9.4", "core-graphics", "cursor-icon", "icrate", @@ -8503,7 +8515,7 @@ name = "wr_glyph_rasterizer" version = "0.1.0" source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", "core-graphics", "core-text", "dwrote", diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml index 172c4f30262..747e6f751c9 100644 --- a/ports/servoshell/Cargo.toml +++ b/ports/servoshell/Cargo.toml @@ -105,7 +105,7 @@ egui = { version = "0.28.1" } egui_glow = { version = "0.28.1", features = ["winit"] } egui-winit = { version = "0.28.1", default-features = false, features = ["clipboard", "wayland"] } euclid = { workspace = true } -gilrs = { git = "https://gitlab.com/gilrs-project/gilrs", rev = "eafb7f2ef488874188c5d75adce9aef486be9d4e" } +gilrs = "0.11.0" gleam = { workspace = true } glow = "0.13.1" headers = { workspace = true } diff --git a/resources/prefs.json b/resources/prefs.json index 5b9f2cd3124..475e344fea8 100644 --- a/resources/prefs.json +++ b/resources/prefs.json @@ -12,7 +12,7 @@ "dom.document.dblclick_timeout": 300, "dom.forcetouch.enabled": false, "dom.fullscreen.test": false, - "dom.gamepad.enabled": false, + "dom.gamepad.enabled": true, "dom.imagebitmap.enabled": false, "dom.microdata.enabled": false, "dom.microdata.testing.enabled": false, diff --git a/servo-tidy.toml b/servo-tidy.toml index 33aff48b987..fdfe384dc72 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -76,6 +76,9 @@ packages = [ # icu_list -> regex-automata 0.2.0 # tracing-subscriber -> matchers -> regex-automata 0.1.0 "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 = [ diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 3b385c48413..2fa080d0353 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -13495,7 +13495,7 @@ ] ], "interfaces.html": [ - "086bc095b078efdcac4f51ef314f7851793dbb53", + "94f1102da478919d2948ebb96f81450f5d545635", [ null, {} diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html index 086bc095b07..94f1102da47 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.html +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html @@ -90,6 +90,12 @@ test_interfaces([ "FormData", "FormDataEvent", "GainNode", + "Gamepad", + "GamepadButton", + "GamepadButtonList", + "GamepadEvent", + "GamepadHapticActuator", + "GamepadPose", "HashChangeEvent", "Headers", "History",