| Index: ui/events/gesture_detection/gesture_event_data_packet.cc
|
| diff --git a/ui/events/gesture_detection/gesture_event_data_packet.cc b/ui/events/gesture_detection/gesture_event_data_packet.cc
|
| index cf251bc632af044d0b47da965b1ac473def5fb9e..a24e4ede3ac6ef838419f3266543c644fb72a27f 100644
|
| --- a/ui/events/gesture_detection/gesture_event_data_packet.cc
|
| +++ b/ui/events/gesture_detection/gesture_event_data_packet.cc
|
| @@ -82,8 +82,10 @@ GestureEventDataPacket& GestureEventDataPacket::operator=(
|
| return *this;
|
| }
|
|
|
| -void GestureEventDataPacket::Push(const GestureEventData& gesture) {
|
| - DCHECK_NE(ET_UNKNOWN, gesture.type());
|
| +void GestureEventDataPacket::Push(const GestureEventData& original_gesture) {
|
| + DCHECK_NE(ET_UNKNOWN, original_gesture.type());
|
| + GestureEventData gesture(original_gesture);
|
| + gesture.unique_touch_event_id = unique_touch_event_id_;
|
| gestures_->push_back(gesture);
|
| }
|
|
|
| @@ -99,7 +101,8 @@ GestureEventDataPacket GestureEventDataPacket::FromTouchTimeout(
|
| const GestureEventData& gesture) {
|
| GestureEventDataPacket packet(gesture.time, TOUCH_TIMEOUT,
|
| gfx::PointF(gesture.x, gesture.y),
|
| - gfx::PointF(gesture.raw_x, gesture.raw_y), 0);
|
| + gfx::PointF(gesture.raw_x, gesture.raw_y),
|
| + gesture.unique_touch_event_id);
|
| packet.Push(gesture);
|
| return packet;
|
| }
|
|
|