| Index: ui/events/gesture_detection/gesture_event_data.cc
|
| diff --git a/ui/events/gesture_detection/gesture_event_data.cc b/ui/events/gesture_detection/gesture_event_data.cc
|
| index 676dadef6f8910545f1482a956743b6acf07a1ee..17af37551e79de466c813017ccf69293ef607665 100644
|
| --- a/ui/events/gesture_detection/gesture_event_data.cc
|
| +++ b/ui/events/gesture_detection/gesture_event_data.cc
|
| @@ -18,7 +18,8 @@ GestureEventData::GestureEventData(const GestureEventDetails& details,
|
| float raw_y,
|
| size_t touch_point_count,
|
| const gfx::RectF& bounding_box,
|
| - int flags)
|
| + int flags,
|
| + uint32_t unique_touch_event_id)
|
| : details(details),
|
| motion_event_id(motion_event_id),
|
| primary_tool_type(primary_tool_type),
|
| @@ -27,7 +28,8 @@ GestureEventData::GestureEventData(const GestureEventDetails& details,
|
| y(y),
|
| raw_x(raw_x),
|
| raw_y(raw_y),
|
| - flags(flags) {
|
| + flags(flags),
|
| + unique_touch_event_id(unique_touch_event_id) {
|
| DCHECK_GE(motion_event_id, 0);
|
| DCHECK_NE(0U, touch_point_count);
|
| this->details.set_touch_points(static_cast<int>(touch_point_count));
|
| @@ -44,7 +46,8 @@ GestureEventData::GestureEventData(EventType type,
|
| y(other.y),
|
| raw_x(other.raw_x),
|
| raw_y(other.raw_y),
|
| - flags(other.flags) {
|
| + flags(other.flags),
|
| + unique_touch_event_id(other.unique_touch_event_id) {
|
| details.set_touch_points(other.details.touch_points());
|
| details.set_bounding_box(other.details.bounding_box_f());
|
| }
|
| @@ -58,7 +61,8 @@ GestureEventData::GestureEventData()
|
| y(0),
|
| raw_x(0),
|
| raw_y(0),
|
| - flags(EF_NONE) {
|
| + flags(EF_NONE),
|
| + unique_touch_event_id(0U) {
|
| }
|
|
|
| } // namespace ui
|
|
|