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 |
(...skipping 12 matching lines...) Expand all Loading... |
23 * DAMAGE. | 23 * DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "modules/gamepad/Gamepad.h" | 26 #include "modules/gamepad/Gamepad.h" |
27 | 27 |
28 namespace blink { | 28 namespace blink { |
29 | 29 |
30 Gamepad::Gamepad() | 30 Gamepad::Gamepad() |
31 : m_index(0) | 31 : m_index(0) |
32 , m_timestamp(0) | 32 , m_timestamp(0) |
| 33 , m_displayId(0) |
33 { | 34 { |
34 } | 35 } |
35 | 36 |
36 Gamepad::~Gamepad() | 37 Gamepad::~Gamepad() |
37 { | 38 { |
38 } | 39 } |
39 | 40 |
40 void Gamepad::setAxes(unsigned count, const double* data) | 41 void Gamepad::setAxes(unsigned count, const double* data) |
41 { | 42 { |
42 m_axes.resize(count); | 43 m_axes.resize(count); |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 } | 90 } |
90 } | 91 } |
91 | 92 |
92 DEFINE_TRACE(Gamepad) | 93 DEFINE_TRACE(Gamepad) |
93 { | 94 { |
94 visitor->trace(m_buttons); | 95 visitor->trace(m_buttons); |
95 visitor->trace(m_pose); | 96 visitor->trace(m_pose); |
96 } | 97 } |
97 | 98 |
98 } // namespace blink | 99 } // namespace blink |
OLD | NEW |