Bug 1356452 - Part 1: Remove assertion for checking VRManager::Get(); r?kip draft
authorDaosheng Mu <daoshengmu@gmail.com>
Tue, 18 Apr 2017 12:45:44 +0800
changeset 565711 7629b70b7af8917b2fd0803b777016c88b975044
parent 565531 20dff607fb88ee69135a280bbb7f32df75a86237
child 565712 0ef7fa3c3e7b6afbbfbdd68b81495ed16a873b25
push id54979
push userbmo:dmu@mozilla.com
push dateThu, 20 Apr 2017 09:28:49 +0000
reviewerskip
bugs1356452
milestone55.0a1
Bug 1356452 - Part 1: Remove assertion for checking VRManager::Get(); r?kip MozReview-Commit-ID: CMCX9Fq55tS
gfx/vr/gfxVR.cpp
--- a/gfx/vr/gfxVR.cpp
+++ b/gfx/vr/gfxVR.cpp
@@ -66,57 +66,52 @@ VRSystemManager::AddGamepad(const VRCont
                       controllerInfo.GetMappingType(),
                       controllerInfo.GetHand(),
                       dom::GamepadServiceType::VR,
                       controllerInfo.GetNumButtons(),
                       controllerInfo.GetNumAxes(),
                       controllerInfo.GetNumHaptics());
 
   VRManager* vm = VRManager::Get();
-  MOZ_ASSERT(vm);
   vm->NotifyGamepadChange<dom::GamepadAdded>(a);
 }
 
 void
 VRSystemManager::RemoveGamepad(uint32_t aIndex)
 {
   dom::GamepadRemoved a(aIndex, dom::GamepadServiceType::VR);
 
   VRManager* vm = VRManager::Get();
-  MOZ_ASSERT(vm);
   vm->NotifyGamepadChange<dom::GamepadRemoved>(a);
 }
 
 void
 VRSystemManager::NewButtonEvent(uint32_t aIndex, uint32_t aButton,
                                 bool aPressed, bool aTouched, double aValue)
 {
   dom::GamepadButtonInformation a(aIndex, dom::GamepadServiceType::VR,
                                   aButton, aValue, aPressed, aTouched);
 
   VRManager* vm = VRManager::Get();
-  MOZ_ASSERT(vm);
   vm->NotifyGamepadChange<dom::GamepadButtonInformation>(a);
 }
 
 void
 VRSystemManager::NewAxisMove(uint32_t aIndex, uint32_t aAxis,
                              double aValue)
 {
   dom::GamepadAxisInformation a(aIndex, dom::GamepadServiceType::VR,
                                 aAxis, aValue);
 
   VRManager* vm = VRManager::Get();
-  MOZ_ASSERT(vm);
   vm->NotifyGamepadChange<dom::GamepadAxisInformation>(a);
 }
 
 void
 VRSystemManager::NewPoseState(uint32_t aIndex,
                               const dom::GamepadPoseState& aPose)
 {
   dom::GamepadPoseInformation a(aIndex, dom::GamepadServiceType::VR,
                                 aPose);
 
   VRManager* vm = VRManager::Get();
-  MOZ_ASSERT(vm);
   vm->NotifyGamepadChange<dom::GamepadPoseInformation>(a);
 }