| Index: ui/events/blink/blink_event_util.cc
|
| diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
|
| index b389600f23b33709d46b444a4dcb420368403f6b..4973782cca69b9763a1cd4c034f7805e1abc4c00 100644
|
| --- a/ui/events/blink/blink_event_util.cc
|
| +++ b/ui/events/blink/blink_event_util.cc
|
| @@ -74,7 +74,7 @@ WebTouchPoint::State ToWebTouchPointState(const MotionEvent& event,
|
| 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);
|
| @@ -127,16 +127,16 @@ WebTouchPoint CreateWebTouchPoint(const MotionEvent& event,
|
| // '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;
|
| }
|
|
|