OLD | NEW |
---|---|
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 |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND |
14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE | 16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE |
17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | 18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | 19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
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 "core/frame/DOMWindowLifecycleObserver.h" | |
30 #include "core/frame/DOMWindowProperty.h" | |
29 #include "heap/Handle.h" | 31 #include "heap/Handle.h" |
30 #include "platform/Supplementable.h" | 32 #include "platform/Supplementable.h" |
31 #include "public/platform/WebGamepads.h" | 33 #include "public/platform/WebGamepads.h" |
32 | 34 |
33 namespace WebCore { | 35 namespace WebCore { |
34 | 36 |
35 class GamepadList; | 37 class GamepadList; |
36 class Navigator; | 38 class Navigator; |
37 class WebKitGamepadList; | 39 class WebKitGamepadList; |
38 | 40 |
39 class NavigatorGamepad FINAL : public Supplement<Navigator> { | 41 class NavigatorGamepad FINAL : public Supplement<Navigator>, public DOMWindowPro perty, public blink::WebGamepadListener, public DOMWindowLifecycleObserver { |
abarth-chromium
2014/03/17 18:23:46
You shouldn't need both DOMWindowProperty and DOMW
kbalazs
2014/03/17 23:49:27
I don't need both indeed. I want to start listenin
| |
40 public: | 42 public: |
41 virtual ~NavigatorGamepad(); | 43 virtual ~NavigatorGamepad(); |
42 static NavigatorGamepad& from(Navigator&); | 44 static NavigatorGamepad& from(Navigator&); |
43 | 45 |
44 static WebKitGamepadList* webkitGetGamepads(Navigator&); | 46 static WebKitGamepadList* webkitGetGamepads(Navigator&); |
45 static GamepadList* getGamepads(Navigator&); | 47 static GamepadList* getGamepads(Navigator&); |
46 | 48 |
47 WebKitGamepadList* webkitGamepads(); | 49 WebKitGamepadList* webkitGamepads(); |
48 GamepadList* gamepads(); | 50 GamepadList* gamepads(); |
49 | 51 |
52 virtual void onGamepadConnected(unsigned index, const blink::WebGamepad&) OV ERRIDE; | |
53 virtual void onGamepadDisconnected(unsigned index, const blink::WebGamepad&) OVERRIDE; | |
abarth-chromium
2014/03/17 18:23:46
We use Obj-C style names:
didConnectGamepad
willD
kbalazs
2014/03/17 23:49:27
Changed to didConnectGamepad and didDisconnectGame
| |
54 | |
55 virtual void didAddEventListener(DOMWindow*, const AtomicString&) OVERRIDE; | |
56 | |
50 private: | 57 private: |
51 NavigatorGamepad(); | 58 explicit NavigatorGamepad(LocalFrame*); |
52 static const char* supplementName(); | 59 static const char* supplementName(); |
53 | 60 |
54 RefPtrWillBePersistent<GamepadList> m_gamepads; | 61 RefPtrWillBePersistent<GamepadList> m_gamepads; |
55 RefPtrWillBePersistent<WebKitGamepadList> m_webkitGamepads; | 62 RefPtrWillBePersistent<WebKitGamepadList> m_webkitGamepads; |
56 }; | 63 }; |
57 | 64 |
58 } // namespace WebCore | 65 } // namespace WebCore |
59 | 66 |
60 #endif // NavigatorGamepad_h | 67 #endif // NavigatorGamepad_h |
OLD | NEW |