Sync Navigator.getGamepads() with the spec

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
@@ skipping 15 matching lines @@
 #include "config.h"
 #include "modules/gamepad/NavigatorGamepad.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "core/page/Page.h"
 #include "modules/gamepad/GamepadDispatcher.h"
 #include "modules/gamepad/GamepadEvent.h"
-#include "modules/gamepad/GamepadList.h"
 
 namespace blink {
 
-template<typename T>
-static void sampleGamepad(unsigned index, T& gamepad, const WebGamepad& webGamepad)
+static Member<Gamepad> sampleGamepad(unsigned index, Gamepad& gamepad, const WebGamepad& webGamepad)
 {
+    Member<Gamepad> gamepad = Gamepad::create();
     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)
+static HeapVector<Member<Gamepad>> sampleGamepads()
 {
-    WebGamepads gamepads;
+    WebGamepads webGamepads;
+    GamepadDispatcher::instance().sampleGamepads(webGamepads);
 
-    GamepadDispatcher::instance().sampleGamepads(gamepads);
-
+    HeapVector<Member<Gamepad>> gamepads;
+    gamepads.reserveCapacity(webGamepads.length);
     for (unsigned i = 0; i < WebGamepads::itemsLengthCap; ++i) {
-        WebGamepad& webGamepad = gamepads.items[i];
-        if (i < gamepads.length && webGamepad.connected) {
-            GamepadType* gamepad = into->item(i);
+        WebGamepad& webGamepad = webGamepads.items[i];
+        if (i < webGamepads.length && webGamepad.connected) {
+            Gamepad* gamepad = gamepads->item(i);
             if (!gamepad)
-                gamepad = GamepadType::create();
+                gamepad = Gamepad::create();
             sampleGamepad(i, *gamepad, webGamepad);
-            into->set(i, gamepad);
+            gamepads->set(i, gamepad);
         } else {
-            into->set(i, 0);
+            gamepads->set(i, 0);
         }
     }
+
+    return gamepads;
 }
-
 NavigatorGamepad* NavigatorGamepad::from(Document& document)
 {
     if (!document.frame() || !document.frame()->domWindow())
         return 0;
     Navigator& navigator = *document.frame()->domWindow()->navigator();
     return &from(navigator);
 }
 
 NavigatorGamepad& NavigatorGamepad::from(Navigator& navigator)
 {
     NavigatorGamepad* supplement = static_cast<NavigatorGamepad*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorGamepad(navigator.frame());
         provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
 
-GamepadList* NavigatorGamepad::getGamepads(Navigator& navigator)
+HeapVector<Member<Gamepad>> NavigatorGamepad::getGamepads(Navigator& navigator)
 {
-    return NavigatorGamepad::from(navigator).gamepads();
+    return NavigatorGamepad::from(navigator).getGamepads();
 }
 
-GamepadList* NavigatorGamepad::gamepads()
+HeapVector<Member<Gamepad>> NavigatorGamepad::getGamepads()
 {
-    if (!m_gamepads)
-        m_gamepads = GamepadList::create();
-    if (startUpdatingIfAttached())
-        sampleGamepads<Gamepad>(m_gamepads.get());
-    return m_gamepads.get();
+    startUpdatingIfAttached();
+    return sampleGamepads();
 }
 
 void NavigatorGamepad::trace(Visitor* visitor)
 {
     visitor->trace(m_gamepads);
     visitor->trace(m_pendingEvents);
     WillBeHeapSupplement<Navigator>::trace(visitor);
     DOMWindowProperty::trace(visitor);
     PlatformEventController::trace(visitor);
     DOMWindowLifecycleObserver::trace(visitor);
@@ skipping 166 matching lines @@
         if (connectedGamepadChanged || (!oldWasConnected && newIsConnected)) {
             m_pendingEvents.append(newGamepad);
         }
     }
 
     if (!m_pendingEvents.isEmpty())
         m_dispatchOneEventRunner.runAsync();
 }
 
 } // namespace blink