Re-enable Eager Gesture Recognition on Aura

ui/events/gesture_detection/gesture_event_data_packet.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/gesture_detection/gesture_event_data_packet.h"
 
 #include "base/logging.h"
 #include "ui/events/gesture_detection/motion_event.h"
 
 namespace ui {
@@ skipping 14 matching lines @@
       return GestureEventDataPacket::TOUCH_START;
     case ui::MotionEvent::ACTION_POINTER_UP:
       return GestureEventDataPacket::TOUCH_END;
   };
   NOTREACHED() << "Invalid ui::MotionEvent action: " << event.GetAction();
   return GestureEventDataPacket::INVALID;
 }
 
 }  // namespace
 
-GestureEventDataPacket::GestureEventDataPacket()
-    : gesture_source_(UNDEFINED) {
-}
-
 GestureEventDataPacket::GestureEventDataPacket(
     base::TimeTicks timestamp,
     GestureSource source,
     const gfx::PointF& touch_location,
     const gfx::PointF& raw_touch_location)
     : 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 simpler...

[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() {
 }
 
 GestureEventDataPacket& GestureEventDataPacket::operator=(
     const GestureEventDataPacket& other) {
   timestamp_ = other.timestamp_;
   gesture_source_ = other.gesture_source_;
   touch_location_ = other.touch_location_;
   raw_touch_location_ = other.raw_touch_location_;
   gestures_ = other.gestures_;

[jdduke (slow), 2014/11/25 20:26:37]

ack_state_ = other.ack_state_;

[tdresser, 2014/11/26 15:17:18]

Done.

   return *this;
 }
 
 void GestureEventDataPacket::Push(const GestureEventData& gesture) {
   DCHECK_NE(ET_UNKNOWN, gesture.type());
   gestures_->push_back(gesture);
 }
 
 GestureEventDataPacket GestureEventDataPacket::FromTouch(
     const ui::MotionEvent& touch) {
   return GestureEventDataPacket(touch.GetEventTime(),
                                 ToGestureSource(touch),
                                 gfx::PointF(touch.GetX(), touch.GetY()),
                                 gfx::PointF(touch.GetRawX(), touch.GetRawY()));
 }
 
 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));
   packet.Push(gesture);
   return packet;
 }
 
 }  // namespace ui