Update rich touch information to conform to standard

views/events/event.cc

 // 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.
 
 #include "views/events/event.h"
 
 #include "views/view.h"
 #include "views/widget/root_view.h"
 
 namespace views {
@@ skipping 167 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent, public:
 
 #if defined(TOUCH_UI)
 TouchEvent::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)
       : LocatedEvent(type, gfx::Point(x, y), flags),
         touch_id_(touch_id),
-        radius_(radius),
-        angle_(angle),
-        ratio_(ratio) {
+        radius_x_(radius_x),
+        radius_y_(radius_y),
+        angle_(angle) {
 }
 
 TouchEvent::TouchEvent(const TouchEvent& model, View* source, View* target)
     : LocatedEvent(model, source, target),
       touch_id_(model.touch_id_),
-      radius_(model.radius_),
-      angle_(model.angle_),
-      ratio_(model.ratio_) {
+      radius_x_(model.radius_x_),
+      radius_y_(model.radius_y_),
+      angle_(model.angle_) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent, private:
 
 TouchEvent::TouchEvent(const TouchEvent& model, View* root)
     : LocatedEvent(model, root),
       touch_id_(model.touch_id_),
-      radius_(model.radius_),
-      angle_(model.angle_),
-      ratio_(model.ratio_) {
+      radius_x_(model.radius_x_),
+      radius_y_(model.radius_y_),
+      angle_(model.angle_) {
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent, public:
 
 // This value matches windows WHEEL_DELTA.
 // static
 const int MouseWheelEvent::kWheelDelta = 120;
 
 }  // namespace views