| 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 10 matching lines...) Expand all  Loading... | 
| 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 Gamepad_h | 26 #ifndef Gamepad_h | 
| 27 #define Gamepad_h | 27 #define Gamepad_h | 
| 28 | 28 | 
| 29 #include "bindings/core/v8/ScriptWrappable.h" | 29 #include "bindings/core/v8/ScriptWrappable.h" | 
| 30 #include "modules/gamepad/GamepadButton.h" | 30 #include "modules/gamepad/GamepadButton.h" | 
| 31 #include "modules/gamepad/GamepadCommon.h" |  | 
| 32 #include "platform/heap/Handle.h" | 31 #include "platform/heap/Handle.h" | 
| 33 #include "public/platform/WebGamepad.h" | 32 #include "public/platform/WebGamepad.h" | 
|  | 33 #include "wtf/Vector.h" | 
|  | 34 #include "wtf/text/WTFString.h" | 
| 34 | 35 | 
| 35 namespace blink { | 36 namespace blink { | 
| 36 | 37 | 
| 37 class Gamepad final : public GarbageCollectedFinalized<Gamepad>, public GamepadC
    ommon, public ScriptWrappable { | 38 class Gamepad final : public GarbageCollectedFinalized<Gamepad>, public ScriptWr
    appable { | 
| 38     DEFINE_WRAPPERTYPEINFO(); | 39     DEFINE_WRAPPERTYPEINFO(); | 
| 39 public: | 40 public: | 
| 40     static Gamepad* create() | 41     static Gamepad* create() | 
| 41     { | 42     { | 
| 42         return new Gamepad; | 43         return new Gamepad; | 
| 43     } | 44     } | 
| 44     ~Gamepad(); | 45     ~Gamepad(); | 
| 45 | 46 | 
|  | 47     typedef Vector<double> DoubleVector; | 
|  | 48 | 
|  | 49     const String& id() const { return m_id; } | 
|  | 50     void setId(const String& id) { m_id = id; } | 
|  | 51 | 
|  | 52     unsigned index() const { return m_index; } | 
|  | 53     void setIndex(unsigned val) { m_index = val; } | 
|  | 54 | 
|  | 55     bool connected() const { return m_connected; } | 
|  | 56     void setConnected(bool val) { m_connected = val; } | 
|  | 57 | 
|  | 58     unsigned long long timestamp() const { return m_timestamp; } | 
|  | 59     void setTimestamp(unsigned long long val) { m_timestamp = val; } | 
|  | 60 | 
|  | 61     const String& mapping() const { return m_mapping; } | 
|  | 62     void setMapping(const String& val) { m_mapping = val; } | 
|  | 63 | 
|  | 64     const DoubleVector& axes() const { return m_axes; } | 
|  | 65     void setAxes(unsigned count, const double* data); | 
|  | 66 | 
| 46     const GamepadButtonVector& buttons() const { return m_buttons; } | 67     const GamepadButtonVector& buttons() const { return m_buttons; } | 
| 47     void setButtons(unsigned count, const WebGamepadButton* data); | 68     void setButtons(unsigned count, const WebGamepadButton* data); | 
| 48 | 69 | 
| 49     void trace(Visitor*); | 70     void trace(Visitor*); | 
| 50 | 71 | 
| 51 private: | 72 private: | 
| 52     Gamepad(); | 73     Gamepad(); | 
|  | 74 | 
|  | 75     String m_id; | 
|  | 76     unsigned m_index; | 
|  | 77     bool m_connected; | 
|  | 78     unsigned long long m_timestamp; | 
|  | 79     String m_mapping; | 
|  | 80     DoubleVector m_axes; | 
| 53     GamepadButtonVector m_buttons; | 81     GamepadButtonVector m_buttons; | 
| 54 }; | 82 }; | 
| 55 | 83 | 
| 56 } // namespace blink | 84 } // namespace blink | 
| 57 | 85 | 
| 58 #endif // Gamepad_h | 86 #endif // Gamepad_h | 
| OLD | NEW | 
|---|