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