Index: Source/platform/PlatformTouchPoint.h |
diff --git a/Source/platform/PlatformTouchPoint.h b/Source/platform/PlatformTouchPoint.h |
index 0f855f0bcb652a003a34bd93bf2046be10c0ba05..8f6bb0d260a129ff906e8cffe61b19c9f14a8035 100644 |
--- a/Source/platform/PlatformTouchPoint.h |
+++ b/Source/platform/PlatformTouchPoint.h |
@@ -20,7 +20,7 @@ |
#ifndef PlatformTouchPoint_h |
#define PlatformTouchPoint_h |
-#include "platform/geometry/IntPoint.h" |
+#include "platform/geometry/FloatPoint.h" |
#include "wtf/Vector.h" |
namespace WebCore { |
@@ -41,8 +41,6 @@ public: |
// This is necessary for us to be able to build synthetic events. |
PlatformTouchPoint() |
: m_id(0) |
- , m_radiusY(0) |
- , m_radiusX(0) |
, m_rotationAngle(0) |
, m_force(0) |
{ |
@@ -50,20 +48,18 @@ public: |
unsigned id() const { return m_id; } |
State state() const { return m_state; } |
- IntPoint screenPos() const { return m_screenPos; } |
- IntPoint pos() const { return m_pos; } |
- int radiusX() const { return m_radiusX; } |
- int radiusY() const { return m_radiusY; } |
+ 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; } |
protected: |
unsigned m_id; |
State m_state; |
- IntPoint m_screenPos; |
- IntPoint m_pos; |
- int m_radiusY; |
- int m_radiusX; |
+ FloatPoint m_screenPos; |
+ FloatPoint m_pos; |
+ FloatSize m_radius; |
float m_rotationAngle; |
float m_force; |
}; |