| Index: ppapi/shared_impl/ppb_gamepad_shared.h
|
| diff --git a/ppapi/shared_impl/ppb_gamepad_shared.h b/ppapi/shared_impl/ppb_gamepad_shared.h
|
| index 6c21d9a3f2d98265fb7762708ab03f235c9bf1e4..22b4df7a7be1477f698feb0f6c826904c4c571ef 100644
|
| --- a/ppapi/shared_impl/ppb_gamepad_shared.h
|
| +++ b/ppapi/shared_impl/ppb_gamepad_shared.h
|
| @@ -9,7 +9,6 @@
|
| #include "base/strings/string16.h"
|
| #include "ppapi/c/ppb_gamepad.h"
|
| #include "ppapi/shared_impl/ppapi_shared_export.h"
|
| -#include "third_party/WebKit/public/platform/WebGamepads.h"
|
|
|
| namespace ppapi {
|
|
|
| @@ -18,17 +17,9 @@ namespace ppapi {
|
|
|
| #pragma pack(push, 1)
|
|
|
| -#if defined(ENABLE_NEW_GAMEPAD_API)
|
| - typedef double buttonValueType;
|
| - typedef double axisValueType;
|
| -#else
|
| - typedef float buttonValueType;
|
| - typedef float axisValueType;
|
| -#endif
|
| -
|
| struct WebKitGamepadButton {
|
| bool pressed;
|
| - buttonValueType value;
|
| + double value;
|
| };
|
|
|
| // This must match the definition of blink::Gamepad. The GamepadHost unit test
|
| @@ -53,7 +44,7 @@ struct WebKitGamepad {
|
| unsigned axes_length;
|
|
|
| // Normalized values representing axes, in the range [-1..1].
|
| - axisValueType axes[kAxesLengthCap];
|
| + double axes[kAxesLengthCap];
|
|
|
| // Number of valid entries in the buttons array.
|
| unsigned buttons_length;
|
|
|