Index: views/events/event.h |
diff --git a/views/events/event.h b/views/events/event.h |
index 7f4b2e3f27f0f12560015f5fb9d225c662958d3c..9b1d33acb362ac29faaa5276992c3f06ba4c3957 100644 |
--- a/views/events/event.h |
+++ b/views/events/event.h |
@@ -261,9 +261,9 @@ class TouchEvent : public LocatedEvent { |
int y, |
int flags, |
int touch_id, |
- float radius, |
- float angle, |
- float ratio); |
+ float radius_x, |
+ float radius_y, |
+ float angle); |
// Create a new TouchEvent which is identical to the provided model. |
// If source / target views are provided, the model location will be converted |
@@ -272,9 +272,9 @@ class TouchEvent : public LocatedEvent { |
int identity() const { return touch_id_; } |
- float radius() const { return radius_; } |
+ float radius_x() const { return radius_x_; } |
+ float radius_y() const { return radius_y_; } |
float angle() const { return angle_; } |
- float ratio() const { return ratio_; } |
private: |
friend class internal::RootView; |
@@ -285,16 +285,15 @@ class TouchEvent : public LocatedEvent { |
// for each separable additional touch that the hardware can detect. |
const int touch_id_; |
- // Half length of the major axis of the touch ellipse. Default 0.0. |
- const float radius_; |
+ // Radius of the X (major) axis of the touch ellipse. 1.0 if unknown. |
+ const float radius_x_; |
+ |
+ // Radius of the Y (minor) axis of the touch ellipse. 1.0 if unknown. |
+ const float radius_y_; |
// Angle of the major axis away from the X axis. Default 0.0. |
const float angle_; |
- // Length ratio between major axis and minor axis of the touch ellipse. 1.0 |
- // if only the major axis is available, prentending the touch is a circle. |
- const float ratio_; |
- |
DISALLOW_COPY_AND_ASSIGN(TouchEvent); |
}; |
#endif |