Index: Source/modules/gamepad/NavigatorGamepad.cpp |
diff --git a/Source/modules/gamepad/NavigatorGamepad.cpp b/Source/modules/gamepad/NavigatorGamepad.cpp |
index f0c840903e01c2528d944a8a25ac01bad9cbaab8..ed3ce6c4b917d023222d3b61368300a5b61a5f66 100644 |
--- a/Source/modules/gamepad/NavigatorGamepad.cpp |
+++ b/Source/modules/gamepad/NavigatorGamepad.cpp |
@@ -34,7 +34,6 @@ |
#include "modules/gamepad/GamepadDispatcher.h" |
#include "modules/gamepad/GamepadEvent.h" |
#include "modules/gamepad/GamepadList.h" |
-#include "modules/gamepad/WebKitGamepadList.h" |
namespace blink { |
@@ -89,27 +88,11 @@ NavigatorGamepad& NavigatorGamepad::from(Navigator& navigator) |
return *supplement; |
} |
-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(); |
- if (window()) { |
- startUpdating(); |
- sampleGamepads<WebKitGamepad>(m_webkitGamepads.get()); |
- } |
- return m_webkitGamepads.get(); |
-} |
- |
GamepadList* NavigatorGamepad::gamepads() |
{ |
if (!m_gamepads) |
@@ -124,7 +107,6 @@ GamepadList* NavigatorGamepad::gamepads() |
void NavigatorGamepad::trace(Visitor* visitor) |
{ |
visitor->trace(m_gamepads); |
- visitor->trace(m_webkitGamepads); |
visitor->trace(m_pendingEvents); |
WillBeHeapSupplement<Navigator>::trace(visitor); |
DOMWindowProperty::trace(visitor); |
@@ -257,7 +239,7 @@ void NavigatorGamepad::pageVisibilityChanged() |
{ |
// Inform the embedder whether it needs to provide gamepad data for us. |
bool visible = page()->visibilityState() == PageVisibilityStateVisible; |
- if (visible && (m_hasEventListener || m_gamepads || m_webkitGamepads)) |
+ if (visible && (m_hasEventListener || m_gamepads)) |
startUpdating(); |
else |
stopUpdating(); |