ui: Fix TouchEvent PointerDetails creation from NativeEvent

ui/events/events_default.cc

 // Copyright (c) 2013 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 "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 
 namespace ui {
 
@@ skipping 78 matching lines @@
 void ClearTouchIdIfReleased(const base::NativeEvent& xev) {
 }
 
 int GetTouchId(const base::NativeEvent& native_event) {
   const ui::TouchEvent* event =
       static_cast<const ui::TouchEvent*>(native_event);
   DCHECK(event->IsTouchEvent());
   return event->touch_id();
 }
 
-float GetTouchRadiusX(const base::NativeEvent& native_event) {
+PointerDetails GetTouchPointerDetailsFromNative(
+    const base::NativeEvent& native_event) {
   const ui::TouchEvent* event =
       static_cast<const ui::TouchEvent*>(native_event);
   DCHECK(event->IsTouchEvent());
-  return event->pointer_details().radius_x();
-}
-
-float GetTouchRadiusY(const base::NativeEvent& native_event) {
-  const ui::TouchEvent* event =
-      static_cast<const ui::TouchEvent*>(native_event);
-  DCHECK(event->IsTouchEvent());
-  return event->pointer_details().radius_y();
+  return event->pointer_details();
 }
 
 float GetTouchAngle(const base::NativeEvent& native_event) {
   const ui::TouchEvent* event =
       static_cast<const ui::TouchEvent*>(native_event);
   DCHECK(event->IsTouchEvent());
   return event->rotation_angle();
 }
 
-float GetTouchForce(const base::NativeEvent& native_event) {
-  const ui::TouchEvent* event =
-      static_cast<const ui::TouchEvent*>(native_event);
-  DCHECK(event->IsTouchEvent());
-  return event->pointer_details().force();
-}
-
 bool GetScrollOffsets(const base::NativeEvent& native_event,
                       float* x_offset,
                       float* y_offset,
                       float* x_offset_ordinal,
                       float* y_offset_ordinal,
                       int* finger_count) {
   const ui::ScrollEvent* event =
       static_cast<const ui::ScrollEvent*>(native_event);
   DCHECK(event->IsScrollEvent());
   if (x_offset)
@@ skipping 27 matching lines @@
     *vx_ordinal = event->x_offset_ordinal();
   if (vy_ordinal)
     *vy_ordinal = event->y_offset_ordinal();
   if (is_cancel)
     *is_cancel = event->type() == ET_SCROLL_FLING_CANCEL;
 
   return true;
 }
 
 }  // namespace ui