Use new WebTouchPoint field names.

ui/events/blink/blink_event_util.cc

 // Copyright 2015 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/events/blink/blink_event_util.h"
 
 #include <cmath>
@@ skipping 56 matching lines @@
                  ? WebTouchPoint::StateReleased
                  : WebTouchPoint::StateStationary;
   }
   NOTREACHED() << "Invalid MotionEvent::Action.";
   return WebTouchPoint::StateUndefined;
 }
 
 WebTouchPoint CreateWebTouchPoint(const MotionEvent& event,
                                   size_t pointer_index) {
   WebTouchPoint touch;
-  touch.id = event.GetPointerId(pointer_index);
+  touch.pointerId = event.GetPointerId(pointer_index);
   touch.state = ToWebTouchPointState(event, pointer_index);
   touch.position.x = event.GetX(pointer_index);
   touch.position.y = event.GetY(pointer_index);
   touch.screenPosition.x = event.GetRawX(pointer_index);
   touch.screenPosition.y = event.GetRawY(pointer_index);
 
   // A note on touch ellipse specifications:
   //
   // Android MotionEvent provides the major and minor axes of the touch ellipse,
   // as well as the orientation of the major axis clockwise from vertical, in
@@ skipping 32 matching lines @@
     DCHECK_GT(orientation_deg, -90.01f);
     DCHECK_LT(orientation_deg, 90.01f);
     if (orientation_deg >= 90.f)
       orientation_deg -= 180.f;
   }
   if (orientation_deg >= 0) {
     // The case orientation_deg == 0 is handled here on purpose: although the
     // 'else' block is equivalent in this case, we want to pass the 0 value
     // unchanged (and 0 is the default value for many devices that don't
     // report elliptical touches).
-    touch.radiusX = minor_radius;
-    touch.radiusY = major_radius;
+    touch.width = minor_radius;
+    touch.height = major_radius;
     touch.rotationAngle = orientation_deg;
   } else {
-    touch.radiusX = major_radius;
-    touch.radiusY = minor_radius;
+    touch.width = major_radius;
+    touch.height = minor_radius;
     touch.rotationAngle = orientation_deg + 90;
   }
 
-  touch.force = event.GetPressure(pointer_index);
+  touch.pressure = event.GetPressure(pointer_index);
 
   return touch;
 }
 
 }  // namespace
 
 blink::WebTouchEvent CreateWebTouchEventFromMotionEvent(
     const MotionEvent& event,
     bool may_cause_scrolling) {
   static_assert(static_cast<int>(MotionEvent::MAX_TOUCH_POINT_COUNT) ==
@@ skipping 160 matching lines @@
 }
 
 WebGestureEvent CreateWebGestureEventFromGestureEventData(
     const GestureEventData& data) {
   return CreateWebGestureEvent(data.details, data.time - base::TimeTicks(),
                                gfx::PointF(data.x, data.y),
                                gfx::PointF(data.raw_x, data.raw_y), data.flags);
 }
 
 }  // namespace ui