third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h - Issue 2146343002: Revert of Remove DOMWindowProperty::willDetachGlobalObjectFromFrame

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h

Issue 2146343002: Revert of Remove DOMWindowProperty::willDetachGlobalObjectFromFrame Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp ('k') | third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a0febcc9ba41942688cf145289604897ceb84461..a170945865ca0f2c6cfb34feaf2c20ec62616fe2 100644

--- a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h

+++ b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h

@@ -26,7 +26,7 @@

#ifndef NavigatorGamepad_h

#define NavigatorGamepad_h

-#include "core/dom/ContextLifecycleObserver.h"

+#include "core/frame/DOMWindowProperty.h"

#include "core/frame/LocalDOMWindow.h"

#include "core/frame/PlatformEventController.h"

#include "modules/ModulesExport.h"

@@ -42,7 +42,7 @@

class GamepadList;

class Navigator;

-class MODULES_EXPORT NavigatorGamepad final : public GarbageCollectedFinalized<NavigatorGamepad>, public Supplement<Navigator>, public ContextLifecycleObserver, public PlatformEventController, public LocalDOMWindow::EventListenerObserver {

+class MODULES_EXPORT NavigatorGamepad final : public GarbageCollectedFinalized<NavigatorGamepad>, public Supplement<Navigator>, public DOMWindowProperty, public PlatformEventController, public LocalDOMWindow::EventListenerObserver {

USING_GARBAGE_COLLECTED_MIXIN(NavigatorGamepad);

public:

static NavigatorGamepad* from(Document&);

@@ -65,8 +65,9 @@

void didRemoveGamepadEventListeners();

bool startUpdatingIfAttached();

- // ContextLifecycleObserver

- void contextDestroyed() override;

+ // DOMWindowProperty

+ void willDestroyGlobalObjectInFrame() override;

+ void willDetachGlobalObjectFromFrame() override;

// PlatformEventController

void registerWithDispatcher() override;