Revise gamepad interface

ppapi/c/dev/ppb_gamepad_dev.h

Index: ppapi/c/dev/ppb_gamepad_dev.h
diff --git a/ppapi/c/dev/ppb_gamepad_dev.h b/ppapi/c/dev/ppb_gamepad_dev.h
index e37362bb7412355c20a932b9b10242ac74ce7496..d345a0c41601cf649eec11f660fef023a28e5730 100644
--- a/ppapi/c/dev/ppb_gamepad_dev.h
+++ b/ppapi/c/dev/ppb_gamepad_dev.h
@@ -3,11 +3,12 @@
  * found in the LICENSE file.
  */
 
-/* From dev/ppb_gamepad_dev.idl modified Tue Feb  7 12:49:02 2012. */
+/* From dev/ppb_gamepad_dev.idl modified Wed Feb 22 13:41:39 2012. */
 
 #ifndef PPAPI_C_DEV_PPB_GAMEPAD_DEV_H_
 #define PPAPI_C_DEV_PPB_GAMEPAD_DEV_H_
 
+#include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_stdint.h"
@@ -22,8 +23,6 @@
  */
 
 
-#pragma pack(push, 1)
-
 /**
  * @addtogroup Structs
  * @{
@@ -31,27 +30,13 @@
 /**
  * The data for one gamepad device.
  */
-struct PP_GamepadData_Dev {
-  /**
-   * Is there a gamepad connected at this index? If this is false, no other
-   * data in this structure is valid.
-   */
-  char connected;
-  /**
-   * String identifier for the type of device/manufacturer.
-   */
-  uint16_t id[128];
-  /**
-   * Monotonically increasing value that is incremented when the data have
-   * been updated.
-   */
-  uint64_t timestamp;
+struct PP_GamepadSampleData_Dev {
   /**
    * Number of valid elements in the |axes| array.
    */
   uint32_t axes_length;
   /**
-   * Normalized values for the axes, indices valid up to |axesLength|-1. Axis
+   * Normalized values for the axes, indices valid up to |axes_length|-1. Axis
    * values range from -1..1, and are in order of "importance".
    */
   float axes[16];
@@ -60,31 +45,49 @@ struct PP_GamepadData_Dev {
    */
   uint32_t buttons_length;
   /**
-   * Normalized values for the buttons, indices valid up to |buttonsLength|
+   * Normalized values for the buttons, indices valid up to |buttons_length|
    * - 1. Button values range from 0..1, and are in order of importance.
    */
   float buttons[32];
+  /**
+   * Monotonically increasing value that is incremented when the data have
+   * been updated.
+   */
+  double timestamp;
+  /**
+   * Identifier for the type of device/manufacturer.
+   */
+  uint16_t id[128];
+  /**
+   * Is there a gamepad connected at this index? If this is false, no other
+   * data in this structure is valid.
+   */
+  PP_Bool connected;
+  /* Padding to make the struct the same size between 64 and 32. */
+  char unused_pad_[4];
 };
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_GamepadSampleData_Dev, 472);
 
 /**
  * The data for all gamepads connected to the system.
  */
-struct PP_GamepadsData_Dev {
+struct PP_GamepadsSampleData_Dev {
   /**
    * Number of valid elements in the |items| array.
    */
   uint32_t length;
+  /* Padding to make the struct the same size between 64 and 32. */
+  char unused_pad_[4];
   /**
    * Data for an individual gamepad device connected to the system.
    */
-  struct PP_GamepadData_Dev items[4];
+  struct PP_GamepadSampleData_Dev items[4];
 };
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_GamepadsSampleData_Dev, 1896);
 /**
  * @}
  */
 
-#pragma pack(pop)
-
 /**
  * @addtogroup Interfaces
  * @{
@@ -97,8 +100,7 @@ struct PPB_Gamepad_Dev_0_1 {
   /**
    * Samples the current state of the connected gamepads.
    */
-  void (*SampleGamepads)(PP_Instance instance,
-                         struct PP_GamepadsData_Dev* data);
+  void (*Sample)(PP_Instance instance, struct PP_GamepadsSampleData_Dev* data);
 };
 
 typedef struct PPB_Gamepad_Dev_0_1 PPB_Gamepad_Dev;