Update rich touch information to conform to standard

views/events/event.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_EVENTS_EVENT_H_
 #define VIEWS_EVENTS_EVENT_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/time.h"
@@ skipping 243 matching lines @@
 class TouchEvent : public LocatedEvent {
  public:
   TouchEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native);
 
   // Create a new touch event.
   TouchEvent(ui::EventType type,
              int x,
              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
   // from |source| coordinate system to |target| coordinate system.
   TouchEvent(const TouchEvent& model, View* source, View* target);
 
   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;
 
   TouchEvent(const TouchEvent& model, View* root);
 
   // The identity (typically finger) of the touch starting at 0 and incrementing
   // 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
 
 ////////////////////////////////////////////////////////////////////////////////
 // KeyEvent class
 //
 //  KeyEvent encapsulates keyboard input events - key press and release.
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 112 matching lines @@
 
   // Bitmask of supported ui::DragDropTypes::DragOperation by the source.
   int source_operations_;
 
   DISALLOW_COPY_AND_ASSIGN(DropTargetEvent);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_EVENTS_EVENT_H_