Share Gamepad and WebKitGamepad implementation

Source/modules/gamepad/NavigatorGamepad.cpp

Index: Source/modules/gamepad/NavigatorGamepad.cpp
diff --git a/Source/modules/gamepad/NavigatorGamepad.cpp b/Source/modules/gamepad/NavigatorGamepad.cpp
index 8aa04555f93f958a5b2d8aefda2827064902f3e8..140a16eb44b23f16aaa1ed4d5d9234f8d275c1d5 100644
--- a/Source/modules/gamepad/NavigatorGamepad.cpp
+++ b/Source/modules/gamepad/NavigatorGamepad.cpp
@@ -33,7 +33,20 @@
 
 namespace WebCore {
 
-static void sampleGamepads(GamepadList* into)
+template<typename T>
+static void sampleGamepad(unsigned index, T& gamepad, const blink::WebGamepad& webGamepad)
+{
+    gamepad.setId(webGamepad.id);
+    gamepad.setIndex(index);
+    gamepad.setConnected(webGamepad.connected);
+    gamepad.setTimestamp(webGamepad.timestamp);
+    gamepad.setMapping(webGamepad.mapping);
+    gamepad.setAxes(webGamepad.axesLength, webGamepad.axes);
+    gamepad.setButtons(webGamepad.buttonsLength, webGamepad.buttons);
+}
+
+template<typename GamepadType, typename ListType>
+static void sampleGamepads(ListType* into)
 {
     blink::WebGamepads gamepads;
 
@@ -42,18 +55,10 @@ static void sampleGamepads(GamepadList* into)
     for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) {
         blink::WebGamepad& webGamepad = gamepads.items[i];
         if (i < gamepads.length && webGamepad.connected) {
-            RefPtrWillBeRawPtr<Gamepad> gamepad = into->item(i);
+            RefPtrWillBeRawPtr<GamepadType> gamepad = into->item(i);
             if (!gamepad)
-                gamepad = Gamepad::create();
-            gamepad->id(webGamepad.id);
-            gamepad->index(i);
-            gamepad->connected(webGamepad.connected);
-            gamepad->timestamp(webGamepad.timestamp);
-#if defined(ENABLE_NEW_GAMEPAD_API)
-            gamepad->mapping(webGamepad.mapping);
-#endif
-            gamepad->axes(webGamepad.axesLength, webGamepad.axes);
-            gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons);
+                gamepad = GamepadType::create();
+            sampleGamepad(i, *gamepad, webGamepad);
             into->set(i, gamepad);
         } else {
             into->set(i, nullptr);
@@ -63,10 +68,12 @@ static void sampleGamepads(GamepadList* into)
 
 NavigatorGamepad::NavigatorGamepad()
 {
+
 }
 
 NavigatorGamepad::~NavigatorGamepad()
 {
+
 }
 
 const char* NavigatorGamepad::supplementName()
@@ -86,14 +93,27 @@ NavigatorGamepad& NavigatorGamepad::from(Navigator& navigator)
 
 GamepadList* NavigatorGamepad::webkitGetGamepads(Navigator& navigator)
 {
+    return NavigatorGamepad::from(navigator).webkitGamepads();
+}
+
+GamepadList* NavigatorGamepad::getGamepads(Navigator& navigator)
+{
     return NavigatorGamepad::from(navigator).gamepads();
 }
 
+GamepadList* NavigatorGamepad::webkitGamepads()
+{
+    if (!m_webkitGamepads)
+        m_webkitGamepads = GamepadList::create();
+    sampleGamepads<Gamepad>(m_webkitGamepads.get());
+    return m_webkitGamepads.get();
+}
+
 GamepadList* NavigatorGamepad::gamepads()
 {
     if (!m_gamepads)
         m_gamepads = GamepadList::create();
-    sampleGamepads(m_gamepads.get());
+    sampleGamepads<Gamepad>(m_gamepads.get());
     return m_gamepads.get();
 }