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

Side by Side Diff: Source/modules/gamepad/NavigatorGamepad.h

Issue 630833003: Replacing the OVERRIDE with override and FINAL with final in WebKit/Source/modules/gamepad (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « Source/modules/gamepad/GamepadList.h ('k') | Source/modules/gamepad/WebKitGamepad.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, Google Inc. All rights reserved. 2 * Copyright (C) 2011, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met: 5 * modification, are permitted provided that the following conditions are met:
6 * 6 *
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 25 matching lines...) Expand all
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class Document; 39 class Document;
40 class Gamepad; 40 class Gamepad;
41 class Gamepads; 41 class Gamepads;
42 class GamepadList; 42 class GamepadList;
43 class Navigator; 43 class Navigator;
44 class WebKitGamepadList; 44 class WebKitGamepadList;
45 45
46 class NavigatorGamepad FINAL : public NoBaseWillBeGarbageCollectedFinalized<Navi gatorGamepad>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty, public PlatformEventController, public DOMWindowLifecycleObserver { 46 class NavigatorGamepad final : public NoBaseWillBeGarbageCollectedFinalized<Navi gatorGamepad>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty, public PlatformEventController, public DOMWindowLifecycleObserver {
47 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorGamepad); 47 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorGamepad);
48 public: 48 public:
49 static NavigatorGamepad* from(Document&); 49 static NavigatorGamepad* from(Document&);
50 static NavigatorGamepad& from(Navigator&); 50 static NavigatorGamepad& from(Navigator&);
51 virtual ~NavigatorGamepad(); 51 virtual ~NavigatorGamepad();
52 52
53 static WebKitGamepadList* webkitGetGamepads(Navigator&); 53 static WebKitGamepadList* webkitGetGamepads(Navigator&);
54 static GamepadList* getGamepads(Navigator&); 54 static GamepadList* getGamepads(Navigator&);
55 55
56 WebKitGamepadList* webkitGamepads(); 56 WebKitGamepadList* webkitGamepads();
57 GamepadList* gamepads(); 57 GamepadList* gamepads();
58 58
59 virtual void trace(Visitor*); 59 virtual void trace(Visitor*);
60 60
61 void didConnectOrDisconnectGamepad(unsigned index, const WebGamepad&, bool c onnected); 61 void didConnectOrDisconnectGamepad(unsigned index, const WebGamepad&, bool c onnected);
62 62
63 private: 63 private:
64 explicit NavigatorGamepad(LocalFrame*); 64 explicit NavigatorGamepad(LocalFrame*);
65 65
66 static const char* supplementName(); 66 static const char* supplementName();
67 67
68 void dispatchOneEvent(); 68 void dispatchOneEvent();
69 void didRemoveGamepadEventListeners(); 69 void didRemoveGamepadEventListeners();
70 70
71 // DOMWindowProperty 71 // DOMWindowProperty
72 virtual void willDestroyGlobalObjectInFrame() OVERRIDE; 72 virtual void willDestroyGlobalObjectInFrame() override;
73 virtual void willDetachGlobalObjectFromFrame() OVERRIDE; 73 virtual void willDetachGlobalObjectFromFrame() override;
74 74
75 // PlatformEventController 75 // PlatformEventController
76 virtual void registerWithDispatcher() OVERRIDE; 76 virtual void registerWithDispatcher() override;
77 virtual void unregisterWithDispatcher() OVERRIDE; 77 virtual void unregisterWithDispatcher() override;
78 virtual bool hasLastData() OVERRIDE; 78 virtual bool hasLastData() override;
79 virtual void didUpdateData() OVERRIDE; 79 virtual void didUpdateData() override;
80 virtual void pageVisibilityChanged() OVERRIDE; 80 virtual void pageVisibilityChanged() override;
81 81
82 // DOMWindowLifecycleObserver 82 // DOMWindowLifecycleObserver
83 virtual void didAddEventListener(LocalDOMWindow*, const AtomicString&) OVERR IDE; 83 virtual void didAddEventListener(LocalDOMWindow*, const AtomicString&) overr ide;
84 virtual void didRemoveEventListener(LocalDOMWindow*, const AtomicString&) OV ERRIDE; 84 virtual void didRemoveEventListener(LocalDOMWindow*, const AtomicString&) ov erride;
85 virtual void didRemoveAllEventListeners(LocalDOMWindow*) OVERRIDE; 85 virtual void didRemoveAllEventListeners(LocalDOMWindow*) override;
86 86
87 PersistentWillBeMember<GamepadList> m_gamepads; 87 PersistentWillBeMember<GamepadList> m_gamepads;
88 PersistentWillBeMember<WebKitGamepadList> m_webkitGamepads; 88 PersistentWillBeMember<WebKitGamepadList> m_webkitGamepads;
89 PersistentHeapDequeWillBeHeapDeque<Member<Gamepad> > m_pendingEvents; 89 PersistentHeapDequeWillBeHeapDeque<Member<Gamepad> > m_pendingEvents;
90 AsyncMethodRunner<NavigatorGamepad> m_dispatchOneEventRunner; 90 AsyncMethodRunner<NavigatorGamepad> m_dispatchOneEventRunner;
91 }; 91 };
92 92
93 } // namespace blink 93 } // namespace blink
94 94
95 #endif // NavigatorGamepad_h 95 #endif // NavigatorGamepad_h
OLDNEW
« no previous file with comments | « Source/modules/gamepad/GamepadList.h ('k') | Source/modules/gamepad/WebKitGamepad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698