mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-07 08:18:41 +09:00
parent
9b1124ccbd
commit
7cc01b1884
3 changed files with 1 additions and 27 deletions
|
|
@ -28,7 +28,6 @@
|
|||
#include "nsIObserverService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsThreadUtils.h"
|
||||
#include "VRManagerChild.h"
|
||||
#include "mozilla/Services.h"
|
||||
#include "mozilla/Unused.h"
|
||||
|
||||
|
|
@ -110,11 +109,6 @@ GamepadManager::StopMonitoring()
|
|||
}
|
||||
mChannelChildren.Clear();
|
||||
mGamepads.Clear();
|
||||
|
||||
#if defined(XP_WIN) || defined(XP_MACOSX) || defined(XP_LINUX)
|
||||
mVRChannelChild = gfx::VRManagerChild::Get();
|
||||
mVRChannelChild->SendControllerListenerRemoved();
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -211,11 +205,6 @@ uint32_t GamepadManager::GetGamepadIndexWithServiceType(uint32_t aIndex,
|
|||
newIndex = aIndex;
|
||||
break;
|
||||
}
|
||||
case GamepadServiceType::VR:
|
||||
{
|
||||
newIndex = aIndex + VR_GAMEPAD_IDX_OFFSET;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
MOZ_ASSERT(false);
|
||||
break;
|
||||
|
|
@ -679,13 +668,6 @@ GamepadManager::ActorCreated(PBackgroundChild *aActor)
|
|||
MOZ_ASSERT(initedChild == child);
|
||||
child->SendGamepadListenerAdded();
|
||||
mChannelChildren.AppendElement(child);
|
||||
|
||||
#if defined(XP_WIN) || defined(XP_MACOSX) || defined(XP_LINUX)
|
||||
// Construct VRManagerChannel and ask adding the connected
|
||||
// VR controllers to GamepadManager
|
||||
mVRChannelChild = gfx::VRManagerChild::Get();
|
||||
mVRChannelChild->SendControllerListenerAdded();
|
||||
#endif
|
||||
}
|
||||
|
||||
//Override nsIIPCBackgroundChildCreateCallback
|
||||
|
|
|
|||
|
|
@ -16,9 +16,6 @@
|
|||
class nsGlobalWindow;
|
||||
|
||||
namespace mozilla {
|
||||
namespace gfx {
|
||||
class VRManagerChild;
|
||||
} // namespace gfx
|
||||
namespace dom {
|
||||
|
||||
class EventTarget;
|
||||
|
|
@ -123,7 +120,6 @@ class GamepadManager final : public nsIObserver,
|
|||
// will be destroyed during the IPDL shutdown chain, so we
|
||||
// don't need to refcount it here.
|
||||
nsTArray<GamepadEventChannelChild *> mChannelChildren;
|
||||
gfx::VRManagerChild* mVRChannelChild;
|
||||
|
||||
private:
|
||||
|
||||
|
|
@ -138,8 +134,6 @@ class GamepadManager final : public nsIObserver,
|
|||
// Indicate that a window has received data from a gamepad.
|
||||
void SetWindowHasSeenGamepad(nsGlobalWindow* aWindow, uint32_t aIndex,
|
||||
bool aHasSeen = true);
|
||||
// Our gamepad index has VR_GAMEPAD_IDX_OFFSET while GamepadChannelType
|
||||
// is from VRManager.
|
||||
uint32_t GetGamepadIndexWithServiceType(uint32_t aIndex, GamepadServiceType aServiceType);
|
||||
|
||||
// Gamepads connected to the system. Copies of these are handed out
|
||||
|
|
|
|||
|
|
@ -6,11 +6,9 @@ namespace mozilla{
|
|||
namespace dom{
|
||||
|
||||
// Standard channel is used for managing gamepads that
|
||||
// are from GamepadPlatformService. VR channel
|
||||
// is for gamepads that are from VRManagerChild.
|
||||
// are from GamepadPlatformService.
|
||||
enum class GamepadServiceType : uint16_t {
|
||||
Standard,
|
||||
VR,
|
||||
NumGamepadServiceType
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue