| Index: device/gamepad/gamepad_pad_state_provider.h
|
| diff --git a/device/gamepad/gamepad_pad_state_provider.h b/device/gamepad/gamepad_pad_state_provider.h
|
| index 3ba83420edae7be619eb53575fa1a4747b1b3a87..c4624baa34e42ef138dbb4321749edf0bfbce603 100644
|
| --- a/device/gamepad/gamepad_pad_state_provider.h
|
| +++ b/device/gamepad/gamepad_pad_state_provider.h
|
| @@ -12,7 +12,7 @@
|
|
|
| #include "device/gamepad/gamepad_export.h"
|
| #include "device/gamepad/gamepad_standard_mappings.h"
|
| -#include "third_party/WebKit/public/platform/WebGamepad.h"
|
| +#include "device/gamepad/public/cpp/gamepad.h"
|
|
|
| namespace device {
|
|
|
| @@ -47,7 +47,7 @@ struct PadState {
|
| GamepadActiveState active_state;
|
|
|
| // Gamepad data, unmapped.
|
| - blink::WebGamepad data;
|
| + Gamepad data;
|
|
|
| // Functions to map from device data to standard layout, if available. May
|
| // be null if no mapping is available or needed.
|
| @@ -59,13 +59,13 @@ struct PadState {
|
| // corresponding bit will be set to 1.
|
|
|
| // If we ever increase the max axis count this will need to be updated.
|
| - static_assert(blink::WebGamepad::kAxesLengthCap <=
|
| + static_assert(Gamepad::kAxesLengthCap <=
|
| std::numeric_limits<uint32_t>::digits,
|
| "axis_mask is not large enough");
|
| uint32_t axis_mask;
|
|
|
| // If we ever increase the max button count this will need to be updated.
|
| - static_assert(blink::WebGamepad::kButtonsLengthCap <=
|
| + static_assert(Gamepad::kButtonsLengthCap <=
|
| std::numeric_limits<uint32_t>::digits,
|
| "button_mask is not large enough");
|
| uint32_t button_mask;
|
| @@ -87,7 +87,7 @@ class DEVICE_GAMEPAD_EXPORT GamepadPadStateProvider {
|
| void InitializeDataFetcher(GamepadDataFetcher* fetcher);
|
|
|
| void MapAndSanitizeGamepadData(PadState* pad_state,
|
| - blink::WebGamepad* pad,
|
| + Gamepad* pad,
|
| bool sanitize);
|
|
|
| // Tracks the state of each gamepad slot.
|
|
|