Chromium Code Reviews| 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 265300cc1fcdfb7bf0c137ce0e2d09b7790b464c..d55e0e98ce3d5f133a721b162311b479f82a9802 100644 |
| --- a/ui/events/gesture_detection/gesture_event_data_packet.cc |
| +++ b/ui/events/gesture_detection/gesture_event_data_packet.cc |
| @@ -32,10 +32,6 @@ GestureEventDataPacket::GestureSource ToGestureSource( |
| } // namespace |
| -GestureEventDataPacket::GestureEventDataPacket() |
| - : gesture_source_(UNDEFINED) { |
| -} |
| - |
| GestureEventDataPacket::GestureEventDataPacket( |
| base::TimeTicks timestamp, |
| GestureSource source, |
| @@ -44,17 +40,25 @@ GestureEventDataPacket::GestureEventDataPacket( |
| : timestamp_(timestamp), |
| touch_location_(touch_location), |
| raw_touch_location_(raw_touch_location), |
| - gesture_source_(source) { |
| - DCHECK_NE(gesture_source_, UNDEFINED); |
| + gesture_source_(source), |
| + ack_state_(AckState::PENDING) { |
| +} |
| + |
| +GestureEventDataPacket::GestureEventDataPacket() |
|
jdduke (slow)
2014/11/25 20:26:36
I'm not sure this delegated constructor is any sim
tdresser
2014/11/26 15:17:18
I'm not either.
Done.
|
| + : GestureEventDataPacket(base::TimeTicks(), |
| + UNDEFINED, |
| + gfx::PointF(), |
| + gfx::PointF()) { |
| } |
| GestureEventDataPacket::GestureEventDataPacket( |
| const GestureEventDataPacket& other) |
| - : timestamp_(other.timestamp_), |
| - gestures_(other.gestures_), |
| - touch_location_(other.touch_location_), |
| - raw_touch_location_(other.raw_touch_location_), |
| - gesture_source_(other.gesture_source_) { |
| + : GestureEventDataPacket(other.timestamp_, |
| + other.gesture_source_, |
| + other.touch_location_, |
| + other.raw_touch_location_) { |
| + gestures_ = other.gestures_; |
| + ack_state_ = other.ack_state_; |
| } |
| GestureEventDataPacket::~GestureEventDataPacket() { |