Gamepad.vibrationActuator.type should be "dual-rumble"

cdumez · cdumez · commit 4eaf82bc0732 · 2023-01-10T17:31:30.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=250410 Reviewed by Alex Christensen. Gamepad.vibrationActuator.type should be "dual-rumble", not "vibration": - https://w3c.github.io/gamepad/extensions.html#dom-gamepadhapticactuatortype * LayoutTests/gamepad/gamepad-vibrationActuator-type-expected.txt: Added. * LayoutTests/gamepad/gamepad-vibrationActuator-type.html: Added. * Source/WebCore/Modules/gamepad/Gamepad.cpp: (WebCore::Gamepad::vibrationActuator): * Source/WebCore/Modules/gamepad/GamepadHapticActuator.cpp: (WebCore::GamepadHapticActuator::create): (WebCore::GamepadHapticActuator::GamepadHapticActuator): * Source/WebCore/Modules/gamepad/GamepadHapticActuator.h: Canonical link: https://commits.webkit.org/258758@main
diff --git a/LayoutTests/gamepad/gamepad-vibrationActuator-type-expected.txt b/LayoutTests/gamepad/gamepad-vibrationActuator-type-expected.txt
@@ -0,0 +1,10 @@
+Tests for vibrationActuator.type
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS gamepad.vibrationActuator.type is "dual-rumble"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/gamepad/gamepad-vibrationActuator-type.html b/LayoutTests/gamepad/gamepad-vibrationActuator-type.html
@@ -0,0 +1,27 @@
+<head>
+<script src="../resources/js-test.js"></script>
+<body>
+<script>
+description("Tests for vibrationActuator.type");
+jsTestIsAsync = true;
+
+function runTest() {
+    addEventListener("gamepadconnected", e => {
+        gamepad = e.gamepad;
+
+        shouldBeEqualToString("gamepad.vibrationActuator.type", "dual-rumble");
+
+        finishJSTest();
+    });
+
+    testRunner.setMockGamepadDetails(0, "Test Gamepad", "", 2, 2);
+    testRunner.setMockGamepadAxisValue(0, 0, 0.7);
+    testRunner.setMockGamepadAxisValue(0, 1, -1.0);
+    testRunner.setMockGamepadButtonValue(0, 0, 1.0);
+    testRunner.setMockGamepadButtonValue(0, 1, 1.0);
+    testRunner.connectMockGamepad(0);
+}
+
+onload = runTest;
+</script>
+</body>
diff --git a/Source/WebCore/Modules/gamepad/Gamepad.cpp b/Source/WebCore/Modules/gamepad/Gamepad.cpp
@@ -75,7 +75,7 @@ void Gamepad::updateFromPlatformGamepad(const PlatformGamepad& platformGamepad)
 GamepadHapticActuator& Gamepad::vibrationActuator()
 {
     if (!m_vibrationActuator)
-        m_vibrationActuator = GamepadHapticActuator::create(*this);
+        m_vibrationActuator = GamepadHapticActuator::create(GamepadHapticActuator::Type::DualRumble, *this);
     return *m_vibrationActuator;
 }
 
diff --git a/Source/WebCore/Modules/gamepad/GamepadHapticActuator.cpp b/Source/WebCore/Modules/gamepad/GamepadHapticActuator.cpp
@@ -38,13 +38,13 @@
 
 namespace WebCore {
 
-Ref<GamepadHapticActuator> GamepadHapticActuator::create(Gamepad& gamepad)
+Ref<GamepadHapticActuator> GamepadHapticActuator::create(Type type, Gamepad& gamepad)
 {
-    return adoptRef(*new GamepadHapticActuator(gamepad));
+    return adoptRef(*new GamepadHapticActuator(type, gamepad));
 }
 
-GamepadHapticActuator::GamepadHapticActuator(Gamepad& gamepad)
-    : m_type { Type::Vibration }
+GamepadHapticActuator::GamepadHapticActuator(Type type, Gamepad& gamepad)
+    : m_type { type }
     , m_gamepad { gamepad }
 {
 }
diff --git a/Source/WebCore/Modules/gamepad/GamepadHapticActuator.h b/Source/WebCore/Modules/gamepad/GamepadHapticActuator.h
@@ -41,20 +41,20 @@ struct GamepadEffectParameters;
 
 class GamepadHapticActuator : public RefCounted<GamepadHapticActuator> {
 public:
-    static Ref<GamepadHapticActuator> create(Gamepad&);
-    ~GamepadHapticActuator();
-
     using EffectType = GamepadHapticEffectType;
     enum class Type : uint8_t { Vibration, DualRumble };
     enum class Result : uint8_t { Complete, Preempted };
 
+    static Ref<GamepadHapticActuator> create(Type, Gamepad&);
+    ~GamepadHapticActuator();
+
     Type type() const { return m_type; }
     bool canPlayEffectType(EffectType) const;
     void playEffect(Document&, EffectType, GamepadEffectParameters&&, Ref<DeferredPromise>&&);
     void reset(Document&, Ref<DeferredPromise>&&);
 
 private:
-    explicit GamepadHapticActuator(Gamepad&);
+    GamepadHapticActuator(Type, Gamepad&);
 
     Type m_type;
     WeakPtr<Gamepad> m_gamepad;

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ void Gamepad::updateFromPlatformGamepad(const PlatformGamepad& platformGamepad)`
`75`	`75`	`GamepadHapticActuator& Gamepad::vibrationActuator()`
`76`	`76`	`{`
`77`	`77`	`if (!m_vibrationActuator)`
`78`		`- m_vibrationActuator = GamepadHapticActuator::create(*this);`
	`78`	`+ m_vibrationActuator = GamepadHapticActuator::create(GamepadHapticActuator::Type::DualRumble, *this);`
`79`	`79`	`return *m_vibrationActuator;`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,13 @@`
`38`	`38`
`39`	`39`	`namespace WebCore {`
`40`	`40`
`41`		`-Ref<GamepadHapticActuator> GamepadHapticActuator::create(Gamepad& gamepad)`
	`41`	`+Ref<GamepadHapticActuator> GamepadHapticActuator::create(Type type, Gamepad& gamepad)`
`42`	`42`	`{`
`43`		`- return adoptRef(*new GamepadHapticActuator(gamepad));`
	`43`	`+ return adoptRef(*new GamepadHapticActuator(type, gamepad));`
`44`	`44`	`}`
`45`	`45`
`46`		`-GamepadHapticActuator::GamepadHapticActuator(Gamepad& gamepad)`
`47`		`- : m_type { Type::Vibration }`
	`46`	`+GamepadHapticActuator::GamepadHapticActuator(Type type, Gamepad& gamepad)`
	`47`	`+ : m_type { type }`
`48`	`48`	`, m_gamepad { gamepad }`
`49`	`49`	`{`
`50`	`50`	`}`