Bug 1523351 - Part 2: Add tests for GamepadTouch and GamepadLightIndicator. r=baku

daoshengmu · daoshengmu · commit 304abbd74d12 · 2019-05-29T20:48:29.000Z
Differential Revision: https://phabricator.services.mozilla.com/D29289 --HG-- extra : moz-landing-system : lando
diff --git a/browser/components/resistfingerprinting/test/mochitest/test_hide_gamepad_info_iframe.html b/browser/components/resistfingerprinting/test/mochitest/test_hide_gamepad_info_iframe.html
@@ -19,6 +19,8 @@
     GamepadService.noHand,
     4, // buttons
     2,
+    0,
+    0,
     0).then((aIndex) => new Promise((aResolve) => {
       // Press a button to make the gamepad visible to the page.
       GamepadService.newButtonEvent(aIndex, 0, true, true);
diff --git a/dom/gamepad/GamepadServiceTest.cpp b/dom/gamepad/GamepadServiceTest.cpp
@@ -90,14 +90,14 @@ void GamepadServiceTest::DestroyPBackgroundActor() {
 already_AddRefed<Promise> GamepadServiceTest::AddGamepad(
     const nsAString& aID, GamepadMappingType aMapping, GamepadHand aHand,
     uint32_t aNumButtons, uint32_t aNumAxes, uint32_t aNumHaptics,
-    ErrorResult& aRv) {
+    uint32_t aNumLightIndicator, uint32_t aNumTouchEvents, ErrorResult& aRv) {
   if (mShuttingDown) {
     return nullptr;
   }
 
   // Only VR controllers has displayID, we give 0 to the general gamepads.
   GamepadAdded a(nsString(aID), aMapping, aHand, 0, aNumButtons, aNumAxes,
-                 aNumHaptics);
+                 aNumHaptics, aNumLightIndicator, aNumTouchEvents);
   GamepadChangeEventBody body(a);
   GamepadChangeEvent e(0, GamepadServiceType::Standard, body);
 
@@ -246,6 +246,40 @@ void GamepadServiceTest::NewPoseMove(
   mChild->SendGamepadTestEvent(id, e);
 }
 
+void GamepadServiceTest::NewTouch(uint32_t aIndex, uint32_t aTouchArrayIndex,
+                                  uint32_t aTouchId, uint8_t aSurfaceId,
+                                  const Float32Array& aPos,
+                                  const Nullable<Float32Array>& aSurfDim) {
+  if (mShuttingDown) {
+    return;
+  }
+
+  GamepadTouchState touchState;
+  touchState.touchId = aTouchId;
+  touchState.surfaceId = aSurfaceId;
+  const Float32Array& value = aPos;
+  value.ComputeLengthAndData();
+  MOZ_ASSERT(value.Length() == 2);
+  touchState.position[0] = value.Data()[0];
+  touchState.position[1] = value.Data()[1];
+
+  if (!aSurfDim.IsNull()) {
+    const Float32Array& value = aSurfDim.Value();
+    value.ComputeLengthAndData();
+    MOZ_ASSERT(value.Length() == 2);
+    touchState.surfaceDimensions[0] = value.Data()[0];
+    touchState.surfaceDimensions[1] = value.Data()[1];
+    touchState.isSurfaceDimensionsValid = true;
+  }
+
+  GamepadTouchInformation a(aTouchArrayIndex, touchState);
+  GamepadChangeEventBody body(a);
+  GamepadChangeEvent e(aIndex, GamepadServiceType::Standard, body);
+
+  uint32_t id = ++mEventNumber;
+  mChild->SendGamepadTestEvent(id, e);
+}
+
 JSObject* GamepadServiceTest::WrapObject(JSContext* aCx,
                                          JS::HandleObject aGivenProto) {
   return GamepadServiceTest_Binding::Wrap(aCx, this, aGivenProto);
diff --git a/dom/gamepad/GamepadServiceTest.h b/dom/gamepad/GamepadServiceTest.h
@@ -33,11 +33,10 @@ class GamepadServiceTest final : public DOMEventTargetHelper {
   GamepadHand LeftHand() const { return GamepadHand::Left; }
   GamepadHand RightHand() const { return GamepadHand::Right; }
 
-  already_AddRefed<Promise> AddGamepad(const nsAString& aID,
-                                       GamepadMappingType aMapping,
-                                       GamepadHand aHand, uint32_t aNumButtons,
-                                       uint32_t aNumAxes, uint32_t aNumHaptics,
-                                       ErrorResult& aRv);
+  already_AddRefed<Promise> AddGamepad(
+      const nsAString& aID, GamepadMappingType aMapping, GamepadHand aHand,
+      uint32_t aNumButtons, uint32_t aNumAxes, uint32_t aNumHaptics,
+      uint32_t aNumLightIndicator, uint32_t aNumTouchEvents, ErrorResult& aRv);
   void RemoveGamepad(uint32_t aIndex);
   void NewButtonEvent(uint32_t aIndex, uint32_t aButton, bool aPressed,
                       bool aTouched);
@@ -50,6 +49,9 @@ class GamepadServiceTest final : public DOMEventTargetHelper {
                    const Nullable<Float32Array>& aAngAcceleration,
                    const Nullable<Float32Array>& aLinVelocity,
                    const Nullable<Float32Array>& aLinAcceleration);
+  void NewTouch(uint32_t aIndex, uint32_t aTouchArrayIndex, uint32_t aTouchId,
+                uint8_t aSurfaceId, const Float32Array& aPos,
+                const Nullable<Float32Array>& aSurfDim);
   void Shutdown();
 
   static already_AddRefed<GamepadServiceTest> CreateTestService(
diff --git a/dom/gamepad/ipc/GamepadTestChannelParent.cpp b/dom/gamepad/ipc/GamepadTestChannelParent.cpp
@@ -26,7 +26,8 @@ mozilla::ipc::IPCResult GamepadTestChannelParent::RecvGamepadTestEvent(
     LossyCopyUTF16toASCII(a.id(), gamepadID);
     uint32_t index = service->AddGamepad(
         gamepadID.get(), static_cast<GamepadMappingType>(a.mapping()), a.hand(),
-        a.num_buttons(), a.num_axes(), a.num_haptics());
+        a.num_buttons(), a.num_axes(), a.num_haptics(), a.num_lights(),
+        a.num_touches());
     if (!mShuttingdown) {
       Unused << SendReplyGamepadIndex(aID, index);
     }
@@ -52,6 +53,11 @@ mozilla::ipc::IPCResult GamepadTestChannelParent::RecvGamepadTestEvent(
     service->NewPoseEvent(index, a.pose_state());
     return IPC_OK();
   }
+  if (body.type() == GamepadChangeEventBody::TGamepadTouchInformation) {
+    const GamepadTouchInformation& a = body.get_GamepadTouchInformation();
+    service->NewMultiTouchEvent(index, a.index(), a.touch_state());
+    return IPC_OK();
+  }
 
   NS_WARNING("Unknown event type.");
   return IPC_FAIL_NO_REASON(this);
diff --git a/dom/tests/mochitest/gamepad/mochitest.ini b/dom/tests/mochitest/gamepad/mochitest.ini
@@ -12,9 +12,13 @@ support-files = test_gamepad_iframe.html
 support-files = test_gamepad_connect_events_iframe.html
 [test_gamepad_extensions.html]
 support-files = test_gamepad_extensions_iframe.html
+scheme = https
 [test_gamepad_frame_state_sync.html]
 support-files = test_gamepad_frame_state_sync_iframe.html
 [test_gamepad_hidden_frame.html]
 support-files = test_gamepad_hidden_frame_iframe.html
+[test_gamepad_multitouch_crossorigin.html]
+support-files = test_gamepad_multitouch_crossorigin_iframe.html
+scheme = https
 [test_navigator_gamepads.html]
 support-files = test_navigator_gamepads_iframe.html
diff --git a/dom/tests/mochitest/gamepad/test_check_timestamp_iframe.html b/dom/tests/mochitest/gamepad/test_check_timestamp_iframe.html
@@ -30,6 +30,8 @@
                             GamepadService.noHand,
                             4,
                             2,
+                            0,
+                            0,
                             0).then(function(i) {
                               index = i;
                               // Press a button to make the gamepad visible
diff --git a/dom/tests/mochitest/gamepad/test_gamepad_connect_events_iframe.html b/dom/tests/mochitest/gamepad/test_gamepad_connect_events_iframe.html
@@ -37,6 +37,8 @@
                             GamepadService.noHand,
                             4, // buttons
                             2,
+                            0,
+                            0,
                             0).then(function(i) {
                               gamepad_index = i;
                               gamepad_connected()
diff --git a/dom/tests/mochitest/gamepad/test_gamepad_extensions_iframe.html b/dom/tests/mochitest/gamepad/test_gamepad_extensions_iframe.html
@@ -17,7 +17,9 @@
 var tests = [
   poseadd,
   posecheck,
-  haptictest
+  touchadd,
+  touchcheck,
+  haptictest // Keep haptictest at the last because it will test removing gamepad from the service.
 ];
 var gamepad_index = 0;
 var testNum = 0;
@@ -27,6 +29,8 @@
 var poseAngAcc = new Float32Array([-0.494, 0.476, -0.241]);
 var poseLinVel = new Float32Array([0.003,0.024,-0.068]);
 var poseLinAcc = new Float32Array([-1.211,21.427,-2.348]);
+var touchData = [{touchId: 0, surfaceId: 0, pos: new Float32Array([-0.5, 0.5]), surf: new Float32Array([100, 100])},
+                 {touchId: 1, surfaceId: 0, pos: new Float32Array([-0.1, 1.0]), surf: new Float32Array([100, 100])}];
 
 window.addEventListener("gamepadconnected", connecthandler);
 window.addEventListener("gamepadbuttondown", function() {
@@ -40,14 +44,19 @@
 }
 
 function startTest() {
-  SpecialPowers.pushPrefEnv({ "set": [["dom.gamepad.extensions.enabled", true]] });
+  SpecialPowers.pushPrefEnv({ "set": [
+                              ["dom.gamepad.extensions.enabled", true],
+                              ["dom.gamepad.extensions.lightindicator", true],
+                              ["dom.gamepad.extensions.multitouch", true]] });
   // Add a gamepad
   GamepadService.addGamepad("test gamepad", // id
                      GamepadService.standardMapping,
                      GamepadService.leftHand,
                      4,
                      2,
-                     1).then(function(i) {
+                     1,
+                     1,
+                     2).then(function(i) {
                       gamepad_index = i;
                        // Simulate button events on the gamepad we added
                       pressButton();
@@ -64,6 +73,8 @@
   is(e.gamepad.buttons.length, 4, "correct number of buttons");
   is(e.gamepad.axes.length, 2, "correct number of axes");
   is(e.gamepad.hapticActuators.length, 1, "correct number of haptics");
+  is(e.gamepad.lightIndicators.length, 1, "correct number of light indicators");
+  is(e.gamepad.touchEvents.length, 2, "correct number of touches");
 }
 
 function checkValueInFloat32Array(array1, array2) {
@@ -129,6 +140,41 @@
   setFrameVisible(f1, false);
 }
 
+function touchadd() {
+  var count = 0;
+  touchData.forEach(function(touch) {
+    GamepadService.newTouch(gamepad_index, count, touch.touchId,
+                            touch.surfaceId, touch.pos,
+                            touch.surf);
+    ++count;
+  });
+
+  pressButton();
+}
+
+function touchcheck() {
+  var gamepads = navigator.getGamepads();
+  var touches = gamepads[0].touchEvents;
+
+  is(touches.length, 2, " number of touches");
+
+  var count = 0;
+  touches.forEach(function(touch) {
+    is(touch.touchId, touchData[count].touchId,
+     "correct GamepadTouch touchId");
+    is(touch.surfaceId, touchData[count].surfaceId,
+     "correct GamepadTouch surfaceId");
+    is(checkValueInFloat32Array(touch.position, touchData[count].pos), true,
+      "correct touch position");
+    is(checkValueInFloat32Array(touch.surfaceDimensions, touchData[count].surf), true,
+      "correct touch surfaceDimensions");
+
+    ++count;
+  });
+  
+  pressButton();
+}
+
 </script>
 <iframe id="f1" src="gamepad_frame_state.html" onload="runGamepadTest(startTest)"></iframe>
 </body>
diff --git a/dom/tests/mochitest/gamepad/test_gamepad_frame_state_sync_iframe.html b/dom/tests/mochitest/gamepad/test_gamepad_frame_state_sync_iframe.html
@@ -32,6 +32,8 @@
                               GamepadService.noHand,
                               4, // buttons
                               2,
+                              0,
+                              0,
                               0).then(function(i) {
                                 index = i;
                                 gamepad_loaded();
diff --git a/dom/tests/mochitest/gamepad/test_gamepad_hidden_frame_iframe.html b/dom/tests/mochitest/gamepad/test_gamepad_hidden_frame_iframe.html
@@ -39,6 +39,8 @@
                               GamepadService.noHand,
                               4, // buttons
                               2,
+                              0,
+                              0,
                               0).then(function(i) {
                                 index = i;
                                 gamepad_loaded();
diff --git a/dom/tests/mochitest/gamepad/test_gamepad_iframe.html b/dom/tests/mochitest/gamepad/test_gamepad_iframe.html
@@ -39,6 +39,8 @@
                      GamepadService.noHand,
                      4,
                      2,
+                     0,
+                     0,
                      0).then(function(i) {
                        index = i;
                        // Simulate button events on the gamepad we added
diff --git a/dom/tests/mochitest/gamepad/test_gamepad_multitouch_crossorigin.html b/dom/tests/mochitest/gamepad/test_gamepad_multitouch_crossorigin.html
@@ -0,0 +1,20 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+   <!DOCTYPE HTML>
+   <html>
+   <head>
+     <title>Test hidden frames</title>
+     <script src="/tests/SimpleTest/SimpleTest.js"></script>
+     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+   </head>
+   <body>
+   <script type="text/javascript" src="mock_gamepad.js"></script>
+   <script class="testbody" type="text/javascript">
+   // This test loads in an iframe, to ensure that the navigator instance is
+   // loaded with the correct value of the preference.
+   SimpleTest.waitForExplicitFinish();
+   setGamepadPreferenceAndCreateIframe("test_gamepad_multitouch_crossorigin_iframe.html");
+   </script>
+   </body>
+   </html>
+   
diff --git a/dom/tests/mochitest/gamepad/test_gamepad_multitouch_crossorigin_iframe.html b/dom/tests/mochitest/gamepad/test_gamepad_multitouch_crossorigin_iframe.html
diff --git a/dom/tests/mochitest/gamepad/test_navigator_gamepads_iframe.html b/dom/tests/mochitest/gamepad/test_navigator_gamepads_iframe.html
diff --git a/dom/webidl/GamepadServiceTest.webidl b/dom/webidl/GamepadServiceTest.webidl
