| Index: ui/events/events_default.cc
|
| diff --git a/ui/events/events_default.cc b/ui/events/events_default.cc
|
| index 7d55e8e790f8146be62ce2d8930fe9b43e165896..b6bf22e7d0df5581ed0de1cd6ead388f4bfb7813 100644
|
| --- a/ui/events/events_default.cc
|
| +++ b/ui/events/events_default.cc
|
| @@ -96,18 +96,12 @@ int GetTouchId(const base::NativeEvent& native_event) {
|
| return event->touch_id();
|
| }
|
|
|
| -float GetTouchRadiusX(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) {
|
| +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_y();
|
| + return event->pointer_details();
|
| }
|
|
|
| float GetTouchAngle(const base::NativeEvent& native_event) {
|
| @@ -117,13 +111,6 @@ float GetTouchAngle(const base::NativeEvent& native_event) {
|
| 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,
|
|
|