2 files changed, 7 insertions, 12 deletions
diff --git a/dom/gamepad/fallback/FallbackGamepad.cpp b/dom/gamepad/fallback/FallbackGamepad.cpp
index 4b37732f51..a69ed8e1d6 100644
--- a/dom/gamepad/fallback/FallbackGamepad.cpp
+++ b/dom/gamepad/fallback/FallbackGamepad.cpp
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include "mozilla/dom/GamepadHandle.h"
+#include "mozilla/Tainting.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/gamepad/ipc/GamepadMessageUtils.h b/dom/gamepad/ipc/GamepadMessageUtils.h
index c29293d3a5..53b3e5f4c9 100644
--- a/dom/gamepad/ipc/GamepadMessageUtils.h
+++ b/dom/gamepad/ipc/GamepadMessageUtils.h
@@ -8,6 +8,7 @@
 #define mozilla_dom_gamepad_GamepadMessageUtils_h
 
 #include "ipc/EnumSerializer.h"
+#include "mozilla/dom/BindingIPCUtils.h"
 #include "mozilla/dom/GamepadBinding.h"
 #include "mozilla/dom/GamepadHandle.h"
 #include "mozilla/dom/GamepadLightIndicatorBinding.h"
@@ -18,24 +19,17 @@ namespace IPC {
 
 template <>
 struct ParamTraits<mozilla::dom::GamepadLightIndicatorType>
-    : public ContiguousEnumSerializer<
-          mozilla::dom::GamepadLightIndicatorType,
-          mozilla::dom::GamepadLightIndicatorType(0),
-          mozilla::dom::GamepadLightIndicatorType(
-              mozilla::dom::GamepadLightIndicatorType::EndGuard_)> {};
+    : public mozilla::dom::WebIDLEnumSerializer<
+          mozilla::dom::GamepadLightIndicatorType> {};
 
 template <>
 struct ParamTraits<mozilla::dom::GamepadMappingType>
-    : public ContiguousEnumSerializer<
-          mozilla::dom::GamepadMappingType, mozilla::dom::GamepadMappingType(0),
-          mozilla::dom::GamepadMappingType(
-              mozilla::dom::GamepadMappingType::EndGuard_)> {};
+    : public mozilla::dom::WebIDLEnumSerializer<
+          mozilla::dom::GamepadMappingType> {};
 
 template <>
 struct ParamTraits<mozilla::dom::GamepadHand>
-    : public ContiguousEnumSerializer<
-          mozilla::dom::GamepadHand, mozilla::dom::GamepadHand(0),
-          mozilla::dom::GamepadHand(mozilla::dom::GamepadHand::EndGuard_)> {};
+    : public mozilla::dom::WebIDLEnumSerializer<mozilla::dom::GamepadHand> {};
 
 template <>
 struct ParamTraits<mozilla::dom::GamepadCapabilityFlags>