OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 15 matching lines...) Loading... |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #ifndef WebTouchPoint_h | 31 #ifndef WebTouchPoint_h |
32 #define WebTouchPoint_h | 32 #define WebTouchPoint_h |
33 | 33 |
34 #include "../platform/WebCommon.h" | 34 #include "../platform/WebCommon.h" |
35 #include "../platform/WebFloatPoint.h" | 35 #include "../platform/WebFloatPoint.h" |
| 36 #include <limits> |
36 | 37 |
37 namespace blink { | 38 namespace blink { |
38 | 39 |
39 class WebTouchPoint { | 40 class WebTouchPoint { |
40 public: | 41 public: |
41 WebTouchPoint() | 42 WebTouchPoint() |
42 : id(0) | 43 : id(0) |
43 , state(StateUndefined) | 44 , state(StateUndefined) |
44 , radiusX(0) | 45 , radiusX(0) |
45 , radiusY(0) | 46 , radiusY(0) |
46 , rotationAngle(0) | 47 , rotationAngle(0) |
47 , force(0) | 48 , force(0) |
| 49 , tilt(std::numeric_limits<float>::quiet_NaN()) |
| 50 , tiltDirection(std::numeric_limits<float>::quiet_NaN()) |
48 { | 51 { |
49 } | 52 } |
50 | 53 |
51 enum State { | 54 enum State { |
52 StateUndefined, | 55 StateUndefined, |
53 StateReleased, | 56 StateReleased, |
54 StatePressed, | 57 StatePressed, |
55 StateMoved, | 58 StateMoved, |
56 StateStationary, | 59 StateStationary, |
57 StateCancelled, | 60 StateCancelled, |
58 }; | 61 }; |
59 | 62 |
60 int id; | 63 int id; |
61 State state; | 64 State state; |
62 WebFloatPoint screenPosition; | 65 WebFloatPoint screenPosition; |
63 WebFloatPoint position; | 66 WebFloatPoint position; |
64 | 67 |
65 float radiusX; | 68 float radiusX; |
66 float radiusY; | 69 float radiusY; |
67 float rotationAngle; | 70 float rotationAngle; |
68 float force; | 71 float force; |
| 72 float tilt; |
| 73 float tiltDirection; |
69 }; | 74 }; |
70 | 75 |
71 } // namespace blink | 76 } // namespace blink |
72 | 77 |
73 #endif | 78 #endif |
OLD | NEW |