Index: Source/platform/PlatformTouchPoint.h |
diff --git a/Source/platform/PlatformTouchPoint.h b/Source/platform/PlatformTouchPoint.h |
index 3f9ecec27ae3dc5daf0526ac0fb62bf50d046f76..9729b67035a93f4b5e5b58e5a8e5938e223aca5c 100644 |
--- a/Source/platform/PlatformTouchPoint.h |
+++ b/Source/platform/PlatformTouchPoint.h |
@@ -21,6 +21,7 @@ |
#define PlatformTouchPoint_h |
#include "platform/geometry/FloatPoint.h" |
+#include "public/platform/WebPointerProperties.h" |
namespace blink { |
@@ -37,28 +38,27 @@ public: |
// This is necessary for us to be able to build synthetic events. |
PlatformTouchPoint() |
- : m_id(0) |
- , m_rotationAngle(0) |
- , m_force(0) |
+ : m_rotationAngle(0) |
{ |
} |
- int id() const { return m_id; } |
+ const WebPointerProperties& pointerProperties() const { return m_pointerProperties; } |
+ int id() const { return pointerProperties().id; } |
State state() const { return m_state; } |
FloatPoint screenPos() const { return m_screenPos; } |
FloatPoint pos() const { return m_pos; } |
FloatSize radius() const { return m_radius; } |
float rotationAngle() const { return m_rotationAngle; } |
- float force() const { return m_force; } |
+ float force() const { return pointerProperties().force; } |
protected: |
- int m_id; |
+ WebPointerProperties m_pointerProperties; |
+ |
State m_state; |
FloatPoint m_screenPos; |
FloatPoint m_pos; |
FloatSize m_radius; |
float m_rotationAngle; |
- float m_force; |
}; |
} |