Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

Unified Diff: public/web/WebTouchPoint.h

Issue 1212113007: Add WebPointerProperties type. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« public/web/WebPointerProperties.h ('K') | « public/web/WebPointerProperties.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
Rick Byers 2015/07/06 17:22:38 I was originally thinking we'd use aggregation (i.
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;
Rick Byers 2015/07/06 17:22:39 These co-ordinate properties could eventually be m
USE eero AT chromium.org 2015/07/07 10:00:56 Done.
- float radiusX;
- float radiusY;
Rick Byers 2015/07/06 17:22:39 You can't just replace radiusX/radiusY with width/
USE eero AT chromium.org 2015/07/07 10:00:56 Done.
float rotationAngle;
- float force;
};
} // namespace blink
« public/web/WebPointerProperties.h ('K') | « public/web/WebPointerProperties.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698