Factor out GamepadCommon base class from Gamepad and WebKitGamepad

Source/modules/gamepad/GamepadCommon.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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * 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
+#ifndef GamepadCommon_h
+#define GamepadCommon_h
 
-#include "bindings/v8/ScriptWrappable.h"
-#include "heap/Handle.h"
-#include "modules/gamepad/GamepadButton.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 GamepadCommon {
 public:
-    static PassRefPtrWillBeRawPtr<Gamepad> create()
-    {
-        return adoptRefWillBeNoop(new Gamepad);
-    }
-    ~Gamepad();
-
+    GamepadCommon();
     typedef Vector<float> FloatVector;
 
     const String& id() const { return m_id; }

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

Just to confirm: You don't want to add virtual to these methods, right? (If we
add virtual to methods in the Common class, it becomes possible to customize the
implementation in child classes.)

     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);
 

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

Shall we add:

virtual void trace(Visitor*) = 0; ?

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

There is no need to trace this base so lets keep it untraced and not add the
virtual trace. (The derived class is final.)

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

Ditto. Ignore my previous comments about virtual :)

-    const GamepadButtonVector& buttons() const { return m_buttons; }
-    void setButtons(unsigned count, const blink::WebGamepadButton* data);
-
-    void trace(Visitor*);
-
-private:
-    Gamepad();
+protected:
     String m_id;
     unsigned m_index;
     bool m_connected;
     unsigned long long m_timestamp;
     String m_mapping;
     FloatVector m_axes;
-    GamepadButtonVector m_buttons;
 };
 
 } // namespace WebCore
 
-#endif // Gamepad_h
+#endif // GamepadCommon_h