| Index: third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h
|
| diff --git a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h
|
| index 8648d75f6061563570f95361dba231879188385d..1b245cfc9a959abb21394613e7429a3aaf26954a 100644
|
| --- a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h
|
| +++ b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h
|
| @@ -26,8 +26,8 @@
|
| #ifndef NavigatorGamepad_h
|
| #define NavigatorGamepad_h
|
|
|
| +#include "core/dom/ContextLifecycleObserver.h"
|
| #include "core/frame/DOMWindowLifecycleObserver.h"
|
| -#include "core/frame/DOMWindowProperty.h"
|
| #include "core/frame/PlatformEventController.h"
|
| #include "modules/ModulesExport.h"
|
| #include "platform/AsyncMethodRunner.h"
|
| @@ -42,7 +42,7 @@ class Gamepad;
|
| class GamepadList;
|
| class Navigator;
|
|
|
| -class MODULES_EXPORT NavigatorGamepad final : public GarbageCollectedFinalized<NavigatorGamepad>, public Supplement<Navigator>, public DOMWindowProperty, public PlatformEventController, public DOMWindowLifecycleObserver {
|
| +class MODULES_EXPORT NavigatorGamepad final : public GarbageCollectedFinalized<NavigatorGamepad>, public Supplement<Navigator>, public ContextLifecycleObserver, public PlatformEventController, public DOMWindowLifecycleObserver {
|
| USING_GARBAGE_COLLECTED_MIXIN(NavigatorGamepad);
|
| public:
|
| static NavigatorGamepad* from(Document&);
|
| @@ -65,9 +65,8 @@ private:
|
| void didRemoveGamepadEventListeners();
|
| bool startUpdatingIfAttached();
|
|
|
| - // DOMWindowProperty
|
| - void willDestroyGlobalObjectInFrame() override;
|
| - void willDetachGlobalObjectFromFrame() override;
|
| + // ContextLifecycleObserver
|
| + void contextDestroyed() override;
|
|
|
| // PlatformEventController
|
| void registerWithDispatcher() override;
|
|
|