Factor out GamepadCommon base class from Gamepad and WebKitGamepad

Source/modules/gamepad/WebKitGamepad.h

Index: Source/modules/gamepad/WebKitGamepad.h
diff --git a/Source/modules/gamepad/WebKitGamepad.h b/Source/modules/gamepad/WebKitGamepad.h
index dff3f72d729492d1afde8392e5be50459e91a885..e5b53dc9158de46b04b509804363d40df2658a40 100644
--- a/Source/modules/gamepad/WebKitGamepad.h
+++ b/Source/modules/gamepad/WebKitGamepad.h
@@ -5,56 +5,32 @@
 #ifndef WebKitGamepad_h
 #define WebKitGamepad_h
 
-#include "bindings/v8/ScriptWrappable.h"
-#include "heap/Handle.h"
-#include "public/platform/WebGamepad.h"
-#include "wtf/RefCounted.h"
+#include "modules/gamepad/Gamepad.h"
 #include "wtf/Vector.h"
-#include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
-class WebKitGamepad FINAL : public RefCountedWillBeGarbageCollectedFinalized<WebKitGamepad>, public ScriptWrappable {
+// Inherit from concrete Gamepad class (instead of factoring out an abstract
+// GamepadCommon class) so Gamepad is simple (unfactored) and low-cruft.
+class WebKitGamepad : public Gamepad {
 public:
     static PassRefPtrWillBeRawPtr<WebKitGamepad> create()
     {
         return adoptRefWillBeNoop(new WebKitGamepad);
     }
-    ~WebKitGamepad();
 
     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);
-
     const FloatVector& buttons() const { return m_buttons; }
     void setButtons(unsigned count, const blink::WebGamepadButton* data);
 
-    void trace(Visitor*);
+    void trace(Visitor*) { };
 
 private:
-    WebKitGamepad();
-    String m_id;
-    unsigned m_index;
-    bool m_connected;
-    unsigned long long m_timestamp;
-    String m_mapping;
-    FloatVector m_axes;
+    WebKitGamepad()
+    {
+        ScriptWrappable::init(this);

[haraken, 2014/03/13 06:29:39]

As discussed offline, we don't want to call ScriptWrappable::init() twice.

[Nils Barth (inactive), 2014/03/13 06:42:21]

kouhei will elaborate;
sounds like simplest/best answer is to in fact have an abstract
base class, and just call ScriptWrappable::init() in the concrete
derived classes.

+    }
     FloatVector m_buttons;
 };