diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /dom/gamepad | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/gamepad')
| -rw-r--r-- | dom/gamepad/fallback/FallbackGamepad.cpp | 1 | ||||
| -rw-r--r-- | dom/gamepad/ipc/GamepadMessageUtils.h | 18 |
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> |