Factor out GamepadCommon base class from Gamepad and WebKitGamepad

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 11 matching lines @@
  * 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 "modules/gamepad/GamepadButton.h"
+#include "modules/gamepad/GamepadCommon.h"
 #include "public/platform/WebGamepad.h"
 #include "wtf/RefCounted.h"
-#include "wtf/Vector.h"
-#include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
-class Gamepad FINAL : public RefCountedWillBeGarbageCollectedFinalized<Gamepad>, public ScriptWrappable {
+class Gamepad FINAL : public RefCountedWillBeGarbageCollectedFinalized<Gamepad>, public GamepadCommon, public ScriptWrappable {
 public:
     static PassRefPtrWillBeRawPtr<Gamepad> create()
     {
         return adoptRefWillBeNoop(new Gamepad);
     }
-    ~Gamepad();
-
-    typedef Vector<float> FloatVector;
-
-    const String& id() const { return m_id; }
-    void setId(const String& id) { m_id = id; }
-
-    unsigned index() const { return m_index; }
-    void setIndex(unsigned val) { m_index = val; }
-
-    bool connected() const { return m_connected; }
-    void setConnected(bool val) { m_connected = val; }
-
-    unsigned long long timestamp() const { return m_timestamp; }
-    void setTimestamp(unsigned long long val) { m_timestamp = val; }
-
-    const String& mapping() const { return m_mapping; }
-    void setMapping(const String& val) { m_mapping = val; }
-
-    const FloatVector& axes() const { return m_axes; }
-    void setAxes(unsigned count, const float* data);
+    ~Gamepad() { }

[zerny-chromium, 2014/03/13 09:48:00]

Nit: keep the impl in the cpp file.

[Nils Barth (inactive), 2014/03/13 12:51:14]

Done.

 
     const GamepadButtonVector& buttons() const { return m_buttons; }
     void setButtons(unsigned count, const blink::WebGamepadButton* data);
 
     void trace(Visitor*);

[haraken, 2014/03/13 09:33:50]

Add virtual.

[zerny-chromium, 2014/03/13 09:48:00]

Gamepad is final and GCFinalized at that type, so trace does not need to be
virtual.

[haraken, 2014/03/13 10:22:35]

sorry, you're right.

 
 private:
-    Gamepad();
-    String m_id;
-    unsigned m_index;
-    bool m_connected;
-    unsigned long long m_timestamp;
-    String m_mapping;
-    FloatVector m_axes;
+    Gamepad() { ScriptWrappable::init(this); }
     GamepadButtonVector m_buttons;
 };
 
 } // namespace WebCore
 
 #endif // Gamepad_h