| Index: ui/events/x/events_x.cc
|
| diff --git a/ui/events/x/events_x.cc b/ui/events/x/events_x.cc
|
| index 21606509016fbcbdd5936ae611813d48c2432e1a..77757ad3a9543ff0c17bca91fae553530a053c5e 100644
|
| --- a/ui/events/x/events_x.cc
|
| +++ b/ui/events/x/events_x.cc
|
| @@ -122,7 +122,8 @@ int GetChangedMouseButtonFlagsFromNative(
|
|
|
| PointerDetails GetMousePointerDetailsFromNative(
|
| const base::NativeEvent& native_event) {
|
| - return PointerDetails(EventPointerType::POINTER_TYPE_MOUSE);
|
| + return PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
|
| + PointerEvent::kMousePointerId);
|
| }
|
|
|
| gfx::Vector2d GetMouseWheelOffset(const base::NativeEvent& native_event) {
|
| @@ -160,7 +161,9 @@ PointerDetails GetTouchPointerDetailsFromNative(
|
| GetTouchRadiusYFromXEvent(*native_event),
|
| GetTouchForceFromXEvent(*native_event),
|
| /* tilt_x */ 0.f,
|
| - /* tilt_y */ 0.f);
|
| + /* tilt_y */ 0.f,
|
| + /* tangential_pressure */ 0.0f,
|
| + /* twist */ 0, GetTouchIdFromXEvent(*native_event));
|
| }
|
|
|
| bool GetScrollOffsets(const base::NativeEvent& native_event,
|
|
|