Added non-prefixed navigator.getGamepads() with updated API

Source/modules/gamepad/NavigatorGamepad.cpp

 /*
  * 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.
  */
 
 #include "config.h"
 #include "modules/gamepad/NavigatorGamepad.h"
 
+#include "core/frame/DOMWindow.h"
+#include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
+#include "modules/gamepad/GamepadEvent.h"
 #include "modules/gamepad/GamepadList.h"
+#include "modules/gamepad/WebKitGamepadList.h"
 #include "public/platform/Platform.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
 
-static void sampleGamepads(GamepadList* into)
+static void sampleGamepad(unsigned index, GamepadBase* gamepad, const blink::WebGamepad& webGamepad)
+{
+    gamepad->id(webGamepad.id);
+    gamepad->index(index);
+    gamepad->connected(webGamepad.connected);
+    gamepad->timestamp(webGamepad.timestamp);
+    gamepad->mapping(webGamepad.mapping);
+    gamepad->axes(webGamepad.axesLength, webGamepad.axes);
+    gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons);
+}
+
+static void sampleWebKitGamepads(WebKitGamepadList* into)
 {
     blink::WebGamepads gamepads;
 
+    blink::Platform::current()->sampleGamepads(gamepads);
+
+    for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) {
+        blink::WebGamepad& webGamepad = gamepads.items[i];
+        if (i < gamepads.length && webGamepad.connected) {
+            RefPtrWillBeRawPtr<WebKitGamepad> gamepad = into->item(i);
+            if (!gamepad)
+                gamepad = WebKitGamepad::create();
+            sampleGamepad(i, gamepad.get(), webGamepad);
+            into->set(i, gamepad);
+        } else {
+            into->set(i, nullptr);
+        }
+    }
+}
+
+static void sampleGamepads(GamepadList* into, LocalFrame* frame)
+{
+    blink::WebGamepads gamepads;
+
     blink::Platform::current()->sampleGamepads(gamepads);
 
     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);
             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);
+            sampleGamepad(i, gamepad.get(), webGamepad);
             into->set(i, gamepad);
         } else {
             into->set(i, nullptr);
         }
     }
 }
 
-NavigatorGamepad::NavigatorGamepad()
+NavigatorGamepad::NavigatorGamepad(LocalFrame* frame)
+    : DOMWindowProperty(frame)
 {
 }
 
 NavigatorGamepad::~NavigatorGamepad()
 {
 }
 
 const char* NavigatorGamepad::supplementName()
 {
     return "NavigatorGamepad";
 }
 
 NavigatorGamepad& NavigatorGamepad::from(Navigator& navigator)
 {
     NavigatorGamepad* supplement = static_cast<NavigatorGamepad*>(Supplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
-        supplement = new NavigatorGamepad();
+        supplement = new NavigatorGamepad(navigator.frame());
         provideTo(navigator, supplementName(), adoptPtr(supplement));
     }
     return *supplement;
 }
 
-GamepadList* NavigatorGamepad::webkitGetGamepads(Navigator& navigator)
+WebKitGamepadList* NavigatorGamepad::webkitGetGamepads(Navigator& navigator)
+{
+    return NavigatorGamepad::from(navigator).webkitGamepads();
+}
+
+GamepadList* NavigatorGamepad::getGamepads(Navigator& navigator)
 {
     return NavigatorGamepad::from(navigator).gamepads();
 }
 
+WebKitGamepadList* NavigatorGamepad::webkitGamepads()
+{
+    if (!m_webkitGamepads)
+        m_webkitGamepads = WebKitGamepadList::create();
+    sampleWebKitGamepads(m_webkitGamepads.get());
+    return m_webkitGamepads.get();
+}
+
 GamepadList* NavigatorGamepad::gamepads()
 {
     if (!m_gamepads)
         m_gamepads = GamepadList::create();
-    sampleGamepads(m_gamepads.get());
+    sampleGamepads(m_gamepads.get(), frame());
     return m_gamepads.get();
 }
 
 } // namespace WebCore