OLD | NEW |
1 /* | 1 /* |
2 Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) | 2 Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) |
3 | 3 |
4 This library is free software; you can redistribute it and/or | 4 This library is free software; you can redistribute it and/or |
5 modify it under the terms of the GNU Library General Public | 5 modify it under the terms of the GNU Library General Public |
6 License as published by the Free Software Foundation; either | 6 License as published by the Free Software Foundation; either |
7 version 2 of the License, or (at your option) any later version. | 7 version 2 of the License, or (at your option) any later version. |
8 | 8 |
9 This library is distributed in the hope that it will be useful, | 9 This library is distributed in the hope that it will be useful, |
10 but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 Library General Public License for more details. | 12 Library General Public License for more details. |
13 | 13 |
14 You should have received a copy of the GNU Library General Public License | 14 You should have received a copy of the GNU Library General Public License |
15 along with this library; see the file COPYING.LIB. If not, write to | 15 along with this library; see the file COPYING.LIB. If not, write to |
16 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
17 Boston, MA 02110-1301, USA. | 17 Boston, MA 02110-1301, USA. |
18 */ | 18 */ |
19 | 19 |
20 #ifndef PlatformTouchPoint_h | 20 #ifndef PlatformTouchPoint_h |
21 #define PlatformTouchPoint_h | 21 #define PlatformTouchPoint_h |
22 | 22 |
23 #include "platform/geometry/FloatPoint.h" | 23 #include "platform/geometry/FloatPoint.h" |
| 24 #include "public/platform/WebPointerProperties.h" |
24 | 25 |
25 namespace blink { | 26 namespace blink { |
26 | 27 |
27 class PlatformTouchPoint { | 28 class PlatformTouchPoint { |
28 public: | 29 public: |
29 enum State { | 30 enum State { |
30 TouchReleased, | 31 TouchReleased, |
31 TouchPressed, | 32 TouchPressed, |
32 TouchMoved, | 33 TouchMoved, |
33 TouchStationary, | 34 TouchStationary, |
34 TouchCancelled, | 35 TouchCancelled, |
35 TouchStateEnd // Placeholder: must remain the last item. | 36 TouchStateEnd // Placeholder: must remain the last item. |
36 }; | 37 }; |
37 | 38 |
38 // This is necessary for us to be able to build synthetic events. | 39 // This is necessary for us to be able to build synthetic events. |
39 PlatformTouchPoint() | 40 PlatformTouchPoint() |
40 : m_id(0) | 41 : m_rotationAngle(0) |
41 , m_rotationAngle(0) | |
42 , m_force(0) | |
43 { | 42 { |
44 } | 43 } |
45 | 44 |
46 int id() const { return m_id; } | 45 const WebPointerProperties& pointerProperties() const { return m_pointerProp
erties; } |
| 46 int id() const { return pointerProperties().id; } |
47 State state() const { return m_state; } | 47 State state() const { return m_state; } |
48 FloatPoint screenPos() const { return m_screenPos; } | 48 FloatPoint screenPos() const { return m_screenPos; } |
49 FloatPoint pos() const { return m_pos; } | 49 FloatPoint pos() const { return m_pos; } |
50 FloatSize radius() const { return m_radius; } | 50 FloatSize radius() const { return m_radius; } |
51 float rotationAngle() const { return m_rotationAngle; } | 51 float rotationAngle() const { return m_rotationAngle; } |
52 float force() const { return m_force; } | 52 float force() const { return pointerProperties().force; } |
53 | 53 |
54 protected: | 54 protected: |
55 int m_id; | 55 WebPointerProperties m_pointerProperties; |
| 56 |
56 State m_state; | 57 State m_state; |
57 FloatPoint m_screenPos; | 58 FloatPoint m_screenPos; |
58 FloatPoint m_pos; | 59 FloatPoint m_pos; |
59 FloatSize m_radius; | 60 FloatSize m_radius; |
60 float m_rotationAngle; | 61 float m_rotationAngle; |
61 float m_force; | |
62 }; | 62 }; |
63 | 63 |
64 } | 64 } |
65 | 65 |
66 #endif // PlatformTouchPoint_h | 66 #endif // PlatformTouchPoint_h |
OLD | NEW |