summaryrefslogtreecommitdiffstats
path: root/dom/gamepad
diff options
context:
space:
mode:
Diffstat (limited to 'dom/gamepad')
-rw-r--r--dom/gamepad/GamepadManager.cpp1
-rw-r--r--dom/gamepad/GamepadManager.h3
-rw-r--r--dom/gamepad/GamepadPlatformService.h1
-rw-r--r--dom/gamepad/GamepadPoseState.h2
-rw-r--r--dom/gamepad/GamepadServiceTest.cpp2
-rw-r--r--dom/gamepad/android/AndroidGamepad.cpp1
-rw-r--r--dom/gamepad/cocoa/CocoaGamepad.cpp1
-rw-r--r--dom/gamepad/ipc/GamepadEventChannelParent.cpp4
-rw-r--r--dom/gamepad/ipc/GamepadTestChannelParent.cpp1
-rw-r--r--dom/gamepad/linux/LinuxGamepad.cpp1
-rw-r--r--dom/gamepad/moz.build12
-rw-r--r--dom/gamepad/windows/WindowsGamepad.cpp1
12 files changed, 23 insertions, 7 deletions
diff --git a/dom/gamepad/GamepadManager.cpp b/dom/gamepad/GamepadManager.cpp
index e17829652..0c05b3ddb 100644
--- a/dom/gamepad/GamepadManager.cpp
+++ b/dom/gamepad/GamepadManager.cpp
@@ -20,7 +20,6 @@
#include "mozilla/StaticPtr.h"
#include "nsAutoPtr.h"
-#include "nsGlobalWindow.h"
#include "nsIDOMEvent.h"
#include "nsIDOMDocument.h"
#include "nsIDOMWindow.h"
diff --git a/dom/gamepad/GamepadManager.h b/dom/gamepad/GamepadManager.h
index a772221ca..38fdfc342 100644
--- a/dom/gamepad/GamepadManager.h
+++ b/dom/gamepad/GamepadManager.h
@@ -7,11 +7,14 @@
#ifndef mozilla_dom_GamepadManager_h_
#define mozilla_dom_GamepadManager_h_
+#include "nsGlobalWindow.h"
#include "nsIIPCBackgroundChildCreateCallback.h"
#include "nsIObserver.h"
// Needed for GamepadMappingType
#include "mozilla/dom/GamepadBinding.h"
+#include "mozilla/dom/GamepadPoseState.h"
#include "mozilla/dom/GamepadServiceType.h"
+#include "nsRefPtrHashtable.h"
class nsGlobalWindow;
diff --git a/dom/gamepad/GamepadPlatformService.h b/dom/gamepad/GamepadPlatformService.h
index 0a61281e4..77a08ae17 100644
--- a/dom/gamepad/GamepadPlatformService.h
+++ b/dom/gamepad/GamepadPlatformService.h
@@ -15,6 +15,7 @@
namespace mozilla {
namespace dom {
+class GamepadChangeEvent;
class GamepadEventChannelParent;
// Platform Service for building and transmitting IPDL messages
diff --git a/dom/gamepad/GamepadPoseState.h b/dom/gamepad/GamepadPoseState.h
index 958b26139..dc5903aba 100644
--- a/dom/gamepad/GamepadPoseState.h
+++ b/dom/gamepad/GamepadPoseState.h
@@ -2,6 +2,8 @@
#ifndef mozilla_dom_gamepad_GamepadPoseState_h_
#define mozilla_dom_gamepad_GamepadPoseState_h_
+#include "mozilla/TypedEnumBits.h"
+
namespace mozilla{
namespace dom{
diff --git a/dom/gamepad/GamepadServiceTest.cpp b/dom/gamepad/GamepadServiceTest.cpp
index 89429b52a..e8ec46cfe 100644
--- a/dom/gamepad/GamepadServiceTest.cpp
+++ b/dom/gamepad/GamepadServiceTest.cpp
@@ -22,6 +22,8 @@
#include "nsIObserver.h"
#include "nsIObserverService.h"
+using namespace mozilla::ipc;
+
namespace mozilla {
namespace dom {
diff --git a/dom/gamepad/android/AndroidGamepad.cpp b/dom/gamepad/android/AndroidGamepad.cpp
index 706d02617..6ed1ef2ee 100644
--- a/dom/gamepad/android/AndroidGamepad.cpp
+++ b/dom/gamepad/android/AndroidGamepad.cpp
@@ -7,6 +7,7 @@
#include "GeneratedJNIWrappers.h"
#include "GeneratedJNINatives.h"
#include "nsThreadUtils.h"
+#include "mozilla/dom/Gamepad.h"
namespace mozilla {
namespace dom {
diff --git a/dom/gamepad/cocoa/CocoaGamepad.cpp b/dom/gamepad/cocoa/CocoaGamepad.cpp
index e7c986e22..24786f5ef 100644
--- a/dom/gamepad/cocoa/CocoaGamepad.cpp
+++ b/dom/gamepad/cocoa/CocoaGamepad.cpp
@@ -7,6 +7,7 @@
// mostly derived from the Allegro source code at:
// http://alleg.svn.sourceforge.net/viewvc/alleg/allegro/branches/4.9/src/macosx/hidjoy.m?revision=13760&view=markup
+#include "mozilla/dom/Gamepad.h"
#include "mozilla/dom/GamepadPlatformService.h"
#include "mozilla/ArrayUtils.h"
#include "nsThreadUtils.h"
diff --git a/dom/gamepad/ipc/GamepadEventChannelParent.cpp b/dom/gamepad/ipc/GamepadEventChannelParent.cpp
index c3c8fd2c8..806081789 100644
--- a/dom/gamepad/ipc/GamepadEventChannelParent.cpp
+++ b/dom/gamepad/ipc/GamepadEventChannelParent.cpp
@@ -1,9 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
+
#include "GamepadEventChannelParent.h"
+
#include "GamepadPlatformService.h"
+#include "mozilla/Unused.h"
#include "mozilla/dom/GamepadMonitoring.h"
+#include "mozilla/ipc/BackgroundParent.h"
#include "nsThreadUtils.h"
namespace mozilla {
diff --git a/dom/gamepad/ipc/GamepadTestChannelParent.cpp b/dom/gamepad/ipc/GamepadTestChannelParent.cpp
index 421447fe0..9730f7d16 100644
--- a/dom/gamepad/ipc/GamepadTestChannelParent.cpp
+++ b/dom/gamepad/ipc/GamepadTestChannelParent.cpp
@@ -5,6 +5,7 @@
#include "GamepadTestChannelParent.h"
#include "mozilla/dom/GamepadPlatformService.h"
+#include "mozilla/ipc/BackgroundParent.h"
#include "mozilla/Unused.h"
namespace mozilla {
diff --git a/dom/gamepad/linux/LinuxGamepad.cpp b/dom/gamepad/linux/LinuxGamepad.cpp
index c45f4174a..8c6e8ea75 100644
--- a/dom/gamepad/linux/LinuxGamepad.cpp
+++ b/dom/gamepad/linux/LinuxGamepad.cpp
@@ -19,6 +19,7 @@
#include <sys/ioctl.h>
#include <unistd.h>
#include "nscore.h"
+#include "mozilla/dom/Gamepad.h"
#include "mozilla/dom/GamepadPlatformService.h"
#include "udev.h"
diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build
index a809d1eba..81ff37631 100644
--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -31,7 +31,7 @@ if CONFIG['MOZ_GAMEPAD']:
'ipc/GamepadTestChannelParent.h'
]
- UNIFIED_SOURCES = [
+ SOURCES = [
'Gamepad.cpp',
'GamepadButton.cpp',
'GamepadManager.cpp',
@@ -46,23 +46,23 @@ if CONFIG['MOZ_GAMEPAD']:
]
if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
- UNIFIED_SOURCES += [
+ SOURCES += [
'fallback/FallbackGamepad.cpp'
]
elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
- UNIFIED_SOURCES += [
+ SOURCES += [
'cocoa/CocoaGamepad.cpp'
]
elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
- UNIFIED_SOURCES += [
+ SOURCES += [
'windows/WindowsGamepad.cpp'
]
elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
- UNIFIED_SOURCES += [
+ SOURCES += [
'linux/LinuxGamepad.cpp'
]
elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android':
- UNIFIED_SOURCES += [
+ SOURCES += [
'android/AndroidGamepad.cpp'
]
diff --git a/dom/gamepad/windows/WindowsGamepad.cpp b/dom/gamepad/windows/WindowsGamepad.cpp
index e1965c00c..ddab2f28c 100644
--- a/dom/gamepad/windows/WindowsGamepad.cpp
+++ b/dom/gamepad/windows/WindowsGamepad.cpp
@@ -24,6 +24,7 @@
#include "mozilla/Services.h"
#include "mozilla/ipc/BackgroundParent.h"
+#include "mozilla/dom/Gamepad.h"
#include "mozilla/dom/GamepadPlatformService.h"
namespace {