Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / gamepad / GamepadDispatcher.cpp

diff --git a/src/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.cpp b/src/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.cpp
index 8a62678..9be3ac5 100644 (file)
--- a/src/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.cpp
+++ b/src/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.cpp
@@ -13,8 +13,8 @@ namespace blink {
 
 GamepadDispatcher& GamepadDispatcher::instance()
 {
-    DEFINE_STATIC_LOCAL(GamepadDispatcher, gamepadDispatcher, ());
-    return gamepadDispatcher;
+    DEFINE_STATIC_LOCAL(Persistent<GamepadDispatcher>, gamepadDispatcher, (new GamepadDispatcher()));
+    return *gamepadDispatcher;
 }
 
 void GamepadDispatcher::sampleGamepads(WebGamepads& gamepads)
@@ -30,6 +30,11 @@ GamepadDispatcher::~GamepadDispatcher()
 {
 }
 
+void GamepadDispatcher::trace(Visitor* visitor)
+{
+    PlatformEventDispatcher::trace(visitor);
+}
+
 void GamepadDispatcher::didConnectGamepad(unsigned index, const WebGamepad& gamepad)
 {
     dispatchDidConnectOrDisconnectGamepad(index, gamepad, true);