Updating Blink-side WebGamepad interface

Source/modules/gamepad/Gamepad.h

Index: Source/modules/gamepad/Gamepad.h
diff --git a/Source/modules/gamepad/Gamepad.h b/Source/modules/gamepad/Gamepad.h
index 50f6b4e50d8a00451a86953760eae6fbe1d3e9ef..da7a0b6ef080c051fa09a6151dcaa5dd55a1bc22 100644
--- a/Source/modules/gamepad/Gamepad.h
+++ b/Source/modules/gamepad/Gamepad.h
@@ -28,6 +28,7 @@
 
 #include "bindings/v8/ScriptWrappable.h"
 #include "heap/Handle.h"
+#include "public/platform/WebGamepad.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
@@ -51,14 +52,24 @@ public:
     unsigned index() const { return m_index; }
     void index(unsigned val) { m_index = val; }
 
+    bool connected() const { return m_connected; }
+    void connected(const bool val) { m_connected = val; }

[scottmg, 2014/02/20 00:59:47]

nit; const bool seems odd

+
     unsigned long long timestamp() const { return m_timestamp; }
     void timestamp(unsigned long long val) { m_timestamp = val; }
 
+    const String& mapping() const { return m_mapping; }
+    void mapping(const String& val) { m_mapping = val; }
+
     const FloatVector& axes() const { return m_axes; }
     void axes(unsigned count, float* data);
 
     const FloatVector& buttons() const { return m_buttons; }
+#if defined(ENABLE_NEW_GAMEPAD_API)
+    void buttons(unsigned count, blink::WebGamepadButton* data);
+#else
     void buttons(unsigned count, float* data);
+#endif
 
     void trace(Visitor*);
 
@@ -66,7 +77,9 @@ private:
     Gamepad();
     String m_id;
     unsigned m_index;
+    bool m_connected;
     unsigned long long m_timestamp;
+    String m_mapping;
     FloatVector m_axes;
     FloatVector m_buttons;
 };