Bug 1305890 - Part 3: Change OpenVR and Oculus Touch gamepad id; r=kip

MozReview-Commit-ID: Igp2mmlI5sW

--HG--
extra : rebase_source : 3c1992f62088b18ad69a8d267f9e101a74841069

gfx/vr/VRDisplayHost.h

@@ -95,7 +95,7 @@ public:
   uint64_t GetButtonPressed();
   void SetPose(const dom::GamepadPoseState& aPose);
   const dom::GamepadPoseState& GetPose();
-  void SetHand(dom::GamepadHand aHand);
+  virtual void SetHand(dom::GamepadHand aHand);
   dom::GamepadHand GetHand();
 
 protected:

gfx/vr/gfxVROculus.cpp

@@ -836,7 +836,7 @@ VRControllerOculus::VRControllerOculus()
   : VRControllerHost(VRDeviceType::Oculus)
 {
   MOZ_COUNT_CTOR_INHERITED(VRControllerOculus, VRControllerHost);
-  mControllerInfo.mControllerName.AssignLiteral("Oculus Touch Controller");
+  mControllerInfo.mControllerName.AssignLiteral("Oculus Touch");
   mControllerInfo.mMappingType = GamepadMappingType::_empty;
   mControllerInfo.mHand = GamepadHand::_empty;
   mControllerInfo.mNumButtons = kNumOculusButton;
@@ -856,6 +856,16 @@ VRControllerOculus::SetAxisMove(uint32_t aAxis, float aValue)
   mAxisMove[aAxis] = aValue;
 }
 
+void
+VRControllerOculus::SetHand(dom::GamepadHand aHand)
+{
+  VRControllerHost::SetHand(aHand);
+  mControllerInfo.mControllerName.AssignLiteral("Oculus Touch (");
+  mControllerInfo.mControllerName.AppendPrintf("%s%s",
+                                               GamepadHandValues::strings[uint32_t(aHand)].value,
+                                               ")");
+}
+
 VRControllerOculus::~VRControllerOculus()
 {
   MOZ_COUNT_DTOR_INHERITED(VRControllerOculus, VRControllerHost);

gfx/vr/gfxVROculus.h

@@ -100,6 +100,7 @@ public:
   explicit VRControllerOculus();
   float GetAxisMove(uint32_t aAxis);
   void SetAxisMove(uint32_t aAxis, float aValue);
+  virtual void SetHand(dom::GamepadHand aHand) override;
 
 protected:
   virtual ~VRControllerOculus();

gfx/vr/gfxVROpenVR.cpp

@@ -424,7 +424,7 @@ VRControllerOpenVR::VRControllerOpenVR()
   : VRControllerHost(VRDeviceType::OpenVR)
 {
   MOZ_COUNT_CTOR_INHERITED(VRControllerOpenVR, VRControllerHost);
-  mControllerInfo.mControllerName.AssignLiteral("OpenVR Controller");
+  mControllerInfo.mControllerName.AssignLiteral("OpenVR Gamepad");
   mControllerInfo.mMappingType = GamepadMappingType::_empty;
   mControllerInfo.mHand = GamepadHand::_empty;
   mControllerInfo.mNumButtons = gNumOpenVRButtonMask;