Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2178)

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

Issue 808643005: Sync Navigator.getGamepads() with the spec Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 10 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 | « Source/modules/gamepad/GamepadList.idl ('k') | Source/modules/gamepad/NavigatorGamepad.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/gamepad/NavigatorGamepad.h
diff --git a/Source/modules/gamepad/NavigatorGamepad.h b/Source/modules/gamepad/NavigatorGamepad.h
index 521424a409f91f03b3518a80cd58aacd2a2834c2..edb8efa8fe679a17ceffc918fc38fb0f8dd930eb 100644
--- a/Source/modules/gamepad/NavigatorGamepad.h
+++ b/Source/modules/gamepad/NavigatorGamepad.h
@@ -38,7 +38,6 @@ namespace blink {
class Document;
class Gamepad;
-class GamepadList;
class Navigator;
class NavigatorGamepad final : public NoBaseWillBeGarbageCollectedFinalized<NavigatorGamepad>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty, public PlatformEventController, public DOMWindowLifecycleObserver {
@@ -48,8 +47,8 @@ public:
static NavigatorGamepad& from(Navigator&);
virtual ~NavigatorGamepad();
- static GamepadList* getGamepads(Navigator&);
- GamepadList* gamepads();
+ static HeapVector<Member<Gamepad>> getGamepads(Navigator&);
+ HeapVector<Member<Gamepad>> getGamepads();
virtual void trace(Visitor*);
@@ -80,7 +79,7 @@ private:
virtual void didRemoveEventListener(LocalDOMWindow*, const AtomicString&) override;
virtual void didRemoveAllEventListeners(LocalDOMWindow*) override;
- PersistentWillBeMember<GamepadList> m_gamepads;
+ //PersistentWillBeMember<GamepadList> m_gamepads;
PersistentHeapDequeWillBeHeapDeque<Member<Gamepad>> m_pendingEvents;
AsyncMethodRunner<NavigatorGamepad> m_dispatchOneEventRunner;
};
« no previous file with comments | « Source/modules/gamepad/GamepadList.idl ('k') | Source/modules/gamepad/NavigatorGamepad.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698