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

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

Issue 280393004: Update Gamepad.axes / GamepadButton.value to match the latest specification (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add back #ifdefs Created 6 years, 7 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/GamepadButton.idl ('k') | Source/modules/gamepad/GamepadCommon.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 18 matching lines...) Expand all
29 #include "public/platform/WebGamepad.h" 29 #include "public/platform/WebGamepad.h"
30 #include "wtf/Vector.h" 30 #include "wtf/Vector.h"
31 #include "wtf/text/WTFString.h" 31 #include "wtf/text/WTFString.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 34
35 class GamepadCommon { 35 class GamepadCommon {
36 public: 36 public:
37 GamepadCommon(); 37 GamepadCommon();
38 ~GamepadCommon(); 38 ~GamepadCommon();
39 typedef Vector<float> FloatVector; 39 typedef Vector<double> DoubleVector;
40 40
41 const String& id() const { return m_id; } 41 const String& id() const { return m_id; }
42 void setId(const String& id) { m_id = id; } 42 void setId(const String& id) { m_id = id; }
43 43
44 unsigned index() const { return m_index; } 44 unsigned index() const { return m_index; }
45 void setIndex(unsigned val) { m_index = val; } 45 void setIndex(unsigned val) { m_index = val; }
46 46
47 bool connected() const { return m_connected; } 47 bool connected() const { return m_connected; }
48 void setConnected(bool val) { m_connected = val; } 48 void setConnected(bool val) { m_connected = val; }
49 49
50 unsigned long long timestamp() const { return m_timestamp; } 50 unsigned long long timestamp() const { return m_timestamp; }
51 void setTimestamp(unsigned long long val) { m_timestamp = val; } 51 void setTimestamp(unsigned long long val) { m_timestamp = val; }
52 52
53 const String& mapping() const { return m_mapping; } 53 const String& mapping() const { return m_mapping; }
54 void setMapping(const String& val) { m_mapping = val; } 54 void setMapping(const String& val) { m_mapping = val; }
55 55
56 const FloatVector& axes() const { return m_axes; } 56 const DoubleVector& axes() const { return m_axes; }
57 #if defined(ENABLE_NEW_GAMEPAD_API)
58 void setAxes(unsigned count, const double* data);
59 #else
57 void setAxes(unsigned count, const float* data); 60 void setAxes(unsigned count, const float* data);
61 #endif
58 62
59 protected: 63 protected:
60 String m_id; 64 String m_id;
61 unsigned m_index; 65 unsigned m_index;
62 bool m_connected; 66 bool m_connected;
63 unsigned long long m_timestamp; 67 unsigned long long m_timestamp;
64 String m_mapping; 68 String m_mapping;
65 FloatVector m_axes; 69 DoubleVector m_axes;
66 }; 70 };
67 71
68 } // namespace WebCore 72 } // namespace WebCore
69 73
70 #endif // GamepadCommon_h 74 #endif // GamepadCommon_h
OLDNEW
« no previous file with comments | « Source/modules/gamepad/GamepadButton.idl ('k') | Source/modules/gamepad/GamepadCommon.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698