Use new WebTouchPoint field names.

content/browser/renderer_host/input/motion_event_web.cc

 // Copyright 2014 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 "content/browser/renderer_host/input/motion_event_web.h"
 
 #include <cmath>
@@ skipping 73 matching lines @@
       << "Invalid action for GetActionIndex(): " << cached_action_;
   DCHECK_GE(cached_action_index_, 0);
   DCHECK_LT(cached_action_index_, static_cast<int>(event_.touchesLength));
   return cached_action_index_;
 }
 
 size_t MotionEventWeb::GetPointerCount() const { return event_.touchesLength; }
 
 int MotionEventWeb::GetPointerId(size_t pointer_index) const {
   DCHECK_LT(pointer_index, GetPointerCount());
-  return event_.touches[pointer_index].id;
+  return event_.touches[pointer_index].pointerId;
 }
 
 float MotionEventWeb::GetX(size_t pointer_index) const {
   DCHECK_LT(pointer_index, GetPointerCount());
   return event_.touches[pointer_index].position.x;
 }
 
 float MotionEventWeb::GetY(size_t pointer_index) const {
   DCHECK_LT(pointer_index, GetPointerCount());
   return event_.touches[pointer_index].position.y;
 }
 
 float MotionEventWeb::GetRawX(size_t pointer_index) const {
   DCHECK_LT(pointer_index, GetPointerCount());
   return event_.touches[pointer_index].screenPosition.x;
 }
 
 float MotionEventWeb::GetRawY(size_t pointer_index) const {
   DCHECK_LT(pointer_index, GetPointerCount());
   return event_.touches[pointer_index].screenPosition.y;
 }
 
 float MotionEventWeb::GetTouchMajor(size_t pointer_index) const {
   DCHECK_LT(pointer_index, GetPointerCount());
-  return 2.f * std::max(event_.touches[pointer_index].radiusX,
-                        event_.touches[pointer_index].radiusY);
+  return 2.f * std::max(event_.touches[pointer_index].width,
+                        event_.touches[pointer_index].height);
 }
 
 float MotionEventWeb::GetTouchMinor(size_t pointer_index) const {
   DCHECK_LT(pointer_index, GetPointerCount());
-  return 2.f * std::min(event_.touches[pointer_index].radiusX,
-                        event_.touches[pointer_index].radiusY);
+  return 2.f * std::min(event_.touches[pointer_index].width,
+                        event_.touches[pointer_index].height);
 }
 
 float MotionEventWeb::GetOrientation(size_t pointer_index) const {
   DCHECK_LT(pointer_index, GetPointerCount());
 
   float rotation_angle_rad = event_.touches[pointer_index].rotationAngle
       * M_PI / 180.f;
   DCHECK(0 <= rotation_angle_rad && rotation_angle_rad <= M_PI_2)
       << "Unexpected touch rotation angle";
 
-  if (event_.touches[pointer_index].radiusX
-      > event_.touches[pointer_index].radiusY) {
-    // The case radiusX == radiusY is omitted from here on purpose: for circles,
+  if (event_.touches[pointer_index].width >
+      event_.touches[pointer_index].height) {
+    // The case width == height is omitted from here on purpose: for circles,
     // we want to pass the angle (which could be any value in such cases but
     // always seem to be set to zero) unchanged.
     rotation_angle_rad -= (float) M_PI_2;
   }
 
   return rotation_angle_rad;
 }
 
 float MotionEventWeb::GetPressure(size_t pointer_index) const {
   return 0.f;
@@ skipping 14 matching lines @@
 
 int MotionEventWeb::GetButtonState() const {
   return 0;
 }
 
 int MotionEventWeb::GetFlags() const {
   return WebEventModifiersToEventFlags(event_.modifiers);
 }
 
 }  // namespace content