1 files changed, 13 insertions, 7 deletions
diff --git a/chromium/third_party/WebKit/Source/modules/gamepad/GamepadList.cpp b/chromium/third_party/WebKit/Source/modules/gamepad/GamepadList.cpp
index 33f3027427a..0a956c35a0b 100644
--- a/chromium/third_party/WebKit/Source/modules/gamepad/GamepadList.cpp
+++ b/chromium/third_party/WebKit/Source/modules/gamepad/GamepadList.cpp
@@ -26,28 +26,34 @@
 #include "config.h"
 #include "modules/gamepad/GamepadList.h"
 
-
 namespace WebCore {
 
+GamepadList::GamepadList()
+{
+    ScriptWrappable::init(this);
+}
+
 GamepadList::~GamepadList()
 {
 }
 
-void GamepadList::set(unsigned index, PassRefPtr<Gamepad> gamepad)
+void GamepadList::set(unsigned index, Gamepad* gamepad)
 {
-    if (index >= kMaximumGamepads)
+    if (index >= blink::WebGamepads::itemsLengthCap)
         return;
     m_items[index] = gamepad;
 }
 
-unsigned GamepadList::length() const
+Gamepad* GamepadList::item(unsigned index)
 {
-    return kMaximumGamepads;
+    return index < length() ? m_items[index].get() : 0;
 }
 
-Gamepad* GamepadList::item(unsigned index)
+void GamepadList::trace(Visitor* visitor)
 {
-    return index < length() ? m_items[index].get() : 0;
+    for (unsigned index = 0; index < blink::WebGamepads::itemsLengthCap; index++) {
+        visitor->trace(m_items[index]);
+    }
 }
 
 } // namespace WebCore