| Index: ui/events/gesture_detection/gesture_event_data.h
|
| diff --git a/ui/events/gesture_detection/gesture_event_data.h b/ui/events/gesture_detection/gesture_event_data.h
|
| index c5e24e048a4a6735786db639c4ec2340997c0b24..1eb948328384477e414ee08af34b21100ae97e85 100644
|
| --- a/ui/events/gesture_detection/gesture_event_data.h
|
| +++ b/ui/events/gesture_detection/gesture_event_data.h
|
| @@ -15,14 +15,13 @@ namespace ui {
|
| class GestureEventDataPacket;
|
|
|
| struct GESTURE_DETECTION_EXPORT GestureEventData {
|
| - GestureEventData(EventType type,
|
| + GestureEventData(const GestureEventDetails&,
|
| int motion_event_id,
|
| base::TimeTicks time,
|
| float x,
|
| float y,
|
| int touch_point_count,
|
| - const gfx::RectF& bounding_box,
|
| - const GestureEventDetails& details);
|
| + const gfx::RectF& bounding_box);
|
|
|
| GestureEventData(EventType type,
|
| int motion_event_id,
|
| @@ -32,14 +31,14 @@ struct GESTURE_DETECTION_EXPORT GestureEventData {
|
| int touch_point_count,
|
| const gfx::RectF& bounding_box);
|
|
|
| - EventType type;
|
| + EventType type() const { return details.type(); }
|
| +
|
| + GestureEventDetails details;
|
| int motion_event_id;
|
| base::TimeTicks time;
|
| float x;
|
| float y;
|
|
|
| - GestureEventDetails details;
|
| -
|
| private:
|
| friend class GestureEventDataPacket;
|
|
|
|
|