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

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

Issue 183313003: Added non-prefixed navigator.getGamepads() with updated API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/gamepad/GamepadList.idl ('k') | Source/modules/gamepad/NavigatorGamepad.cpp » ('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 10 matching lines...) Expand all
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
23 * DAMAGE. 23 * DAMAGE.
24 */ 24 */
25 25
26 #ifndef NavigatorGamepad_h 26 #ifndef NavigatorGamepad_h
27 #define NavigatorGamepad_h 27 #define NavigatorGamepad_h
28 28
29 #include "heap/Handle.h" 29 #include "heap/Handle.h"
30 #include "platform/Supplementable.h" 30 #include "platform/Supplementable.h"
31 #include "public/platform/WebGamepads.h"
31 32
32 namespace WebCore { 33 namespace WebCore {
33 34
34 class GamepadList; 35 class GamepadList;
35 class Navigator; 36 class Navigator;
37 class WebKitGamepadList;
36 38
37 class NavigatorGamepad FINAL : public Supplement<Navigator> { 39 class NavigatorGamepad FINAL : public Supplement<Navigator> {
38 public: 40 public:
39 virtual ~NavigatorGamepad(); 41 virtual ~NavigatorGamepad();
40 static NavigatorGamepad& from(Navigator&); 42 static NavigatorGamepad& from(Navigator&);
41 43
42 static GamepadList* webkitGetGamepads(Navigator&); 44 static WebKitGamepadList* webkitGetGamepads(Navigator&);
45 static GamepadList* getGamepads(Navigator&);
43 46
47 WebKitGamepadList* webkitGamepads();
44 GamepadList* gamepads(); 48 GamepadList* gamepads();
45 49
46 private: 50 private:
47 NavigatorGamepad(); 51 NavigatorGamepad();
48 static const char* supplementName(); 52 static const char* supplementName();
49 53
50 RefPtrWillBePersistent<GamepadList> m_gamepads; 54 RefPtrWillBePersistent<GamepadList> m_gamepads;
55 RefPtrWillBePersistent<WebKitGamepadList> m_webkitGamepads;
51 }; 56 };
52 57
53 } // namespace WebCore 58 } // namespace WebCore
54 59
55 #endif // NavigatorGamepad_h 60 #endif // NavigatorGamepad_h
OLDNEW
« 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