Updating Blink-side WebGamepad interface

Source/modules/gamepad/Gamepad.h

 /*
  * Copyright (C) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  */
 
 #ifndef Gamepad_h
 #define Gamepad_h
 
 #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"
 
 namespace WebCore {
 
 class Gamepad: public RefCountedWillBeGarbageCollectedFinalized<Gamepad>, public ScriptWrappable {
     DECLARE_GC_INFO;
 public:
     static PassRefPtrWillBeRawPtr<Gamepad> create()
     {
         return adoptRefWillBeNoop(new Gamepad);
     }
     ~Gamepad();
 
     typedef Vector<float> FloatVector;
 
     const String& id() const { return m_id; }
     void id(const String& id) { m_id = id; }
 
     unsigned index() const { return m_index; }
     void index(unsigned val) { m_index = val; }
 
+    bool connected() const { return m_connected; }
+    void connected(bool val) { m_connected = val; }
+
     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*);
 
 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;
 };
 
 } // namespace WebCore
 
 #endif // Gamepad_h