Index: public/web/WebTouchPoint.h |
diff --git a/public/web/WebTouchPoint.h b/public/web/WebTouchPoint.h |
index fc0231a5cab40a187d777ce808c233115d16969b..d41f24cad42caff50b1835a3a399b8bf6edee08a 100644 |
--- a/public/web/WebTouchPoint.h |
+++ b/public/web/WebTouchPoint.h |
@@ -33,18 +33,20 @@ |
#include "../platform/WebCommon.h" |
#include "../platform/WebFloatPoint.h" |
+#include "../platform/WebPointerProperties.h" |
namespace blink { |
-class WebTouchPoint { |
+// TODO(e_hakkinen): Replace WebTouchEvent with WebPointerEvent and remove |
+// WebTouchEvent and this. |
+class WebTouchPoint : public WebPointerProperties { |
public: |
WebTouchPoint() |
- : id(0) |
+ : WebPointerProperties() |
, state(StateUndefined) |
, radiusX(0) |
, radiusY(0) |
, rotationAngle(0) |
- , force(0) |
{ |
} |
@@ -57,15 +59,15 @@ public: |
StateCancelled, |
}; |
- int id; |
State state; |
+ |
+ // TODO(e_hakkinen): Move position fields to WebPointerProperties. |
WebFloatPoint screenPosition; |
WebFloatPoint position; |
float radiusX; |
float radiusY; |
float rotationAngle; |
- float force; |
}; |
} // namespace blink |