| Index: ui/events/event.h
|
| diff --git a/ui/events/event.h b/ui/events/event.h
|
| index 114d73ad320cd7fdfe2753c397b0669f8c4a4f9e..3f2dc8d63f48b508c2457ac2df103b9240f94c21 100644
|
| --- a/ui/events/event.h
|
| +++ b/ui/events/event.h
|
| @@ -1049,11 +1049,14 @@ class EVENTS_EXPORT ScrollEvent : public MouseEvent {
|
|
|
| class EVENTS_EXPORT GestureEvent : public LocatedEvent {
|
| public:
|
| + // The constructor takes a default unique_touch_id of zero to support many
|
| + // (80+) existing tests that doesn't care about this id.
|
| GestureEvent(float x,
|
| float y,
|
| int flags,
|
| base::TimeDelta time_stamp,
|
| - const GestureEventDetails& details);
|
| + const GestureEventDetails& details,
|
| + uint32_t unique_touch_event_id = 0);
|
|
|
| // Create a new GestureEvent which is identical to the provided model.
|
| // If source / target windows are provided, the model location will be
|
| @@ -1068,6 +1071,10 @@ class EVENTS_EXPORT GestureEvent : public LocatedEvent {
|
|
|
| const GestureEventDetails& details() const { return details_; }
|
|
|
| + uint32_t unique_touch_event_id() const {
|
| + return unique_touch_event_id_;
|
| + }
|
| +
|
| private:
|
| // For (de)serialization.
|
| GestureEvent(EventType type, base::TimeDelta time_stamp, int flags)
|
| @@ -1076,6 +1083,11 @@ class EVENTS_EXPORT GestureEvent : public LocatedEvent {
|
| friend struct IPC::ParamTraits<ui::GestureEvent>;
|
|
|
| GestureEventDetails details_;
|
| +
|
| + // The unique id of the touch event that released the gesture event. This
|
| + // field gets a non-zero value only for gestures that are released through
|
| + // TouchDispositionGestureFilter::SendGesture.
|
| + uint32_t unique_touch_event_id_;
|
| };
|
|
|
| } // namespace ui
|
|
|