Chromium Code Reviews| Index: views/events/event.h |
| diff --git a/views/events/event.h b/views/events/event.h |
| index 7f4b2e3f27f0f12560015f5fb9d225c662958d3c..db5127094ea3a10fba4b52ada75f759c9afde202 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 radiusX, |
|
sadrul
2011/06/08 17:30:14
In chrome code, 'radius_x' etc. instead of camelCa
Yufeng Shen (Slow to review)
2011/06/08 19:39:24
Done.
|
| + float radiusY, |
| + 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 radiusX() const { return radiusX_; } |
| + float radiusY() const { return radiusY_; } |
| 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 radiusX_; |
| + |
| + // Radius of the Y (minor) axis of the touch ellipse. 1.0 if unknown. |
| + const float radiusY_; |
| // 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 |