Re-enable Eager Gesture Recognition on Aura

ui/events/event.cc

 // Copyright (c) 2012 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/event.h"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
@@ skipping 150 matching lines @@
   CHECK(IsGestureEvent());
   return static_cast<const GestureEvent*>(this);
 }
 
 bool Event::HasNativeEvent() const {
   base::NativeEvent null_event;
   std::memset(&null_event, 0, sizeof(null_event));
   return !!std::memcmp(&native_event_, &null_event, sizeof(null_event));
 }
 
+void Event::DisableSynchronousHandling() {
+  result_ = static_cast<EventResult>(result_ | ER_DISABLE_SYNC_HANDLING);
+}
+
 void Event::StopPropagation() {
   // TODO(sad): Re-enable these checks once View uses dispatcher to dispatch
   // events.
   // CHECK(phase_ != EP_PREDISPATCH && phase_ != EP_POSTDISPATCH);
   CHECK(cancelable_);
   result_ = static_cast<EventResult>(result_ | ER_CONSUMED);
 }
 
 void Event::SetHandled() {
   // TODO(sad): Re-enable these checks once View uses dispatcher to dispatch
@@ skipping 324 matching lines @@
         gfx::ToRoundedInt(SkMScalarToFloat(offset_.y() * decomp.scale[1])));
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent
 
 TouchEvent::TouchEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
       touch_id_(GetTouchId(native_event)),
+      touch_event_id_(get_next_touch_event_id()),
       radius_x_(GetTouchRadiusX(native_event)),
       radius_y_(GetTouchRadiusY(native_event)),
       rotation_angle_(GetTouchAngle(native_event)),
       force_(GetTouchForce(native_event)) {
   latency()->AddLatencyNumberWithTimestamp(
       INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
       0,
       0,
       base::TimeTicks::FromInternalValue(time_stamp().ToInternalValue()),
       1);
 
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
 
   if (type() == ET_TOUCH_PRESSED)
     IncrementTouchIdRefCount(native_event);
 }
 
 TouchEvent::TouchEvent(EventType type,
                        const gfx::PointF& location,
                        int touch_id,
                        base::TimeDelta time_stamp)
     : LocatedEvent(type, location, location, time_stamp, 0),
       touch_id_(touch_id),
+      touch_event_id_(get_next_touch_event_id()),
       radius_x_(0.0f),
       radius_y_(0.0f),
       rotation_angle_(0.0f),
       force_(0.0f) {
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
 }
 
 TouchEvent::TouchEvent(EventType type,
                        const gfx::PointF& location,
                        int flags,
                        int touch_id,
                        base::TimeDelta time_stamp,
                        float radius_x,
                        float radius_y,
                        float angle,
                        float force)
     : LocatedEvent(type, location, location, time_stamp, flags),
       touch_id_(touch_id),
+      touch_event_id_(get_next_touch_event_id()),
       radius_x_(radius_x),
       radius_y_(radius_y),
       rotation_angle_(angle),
       force_(force) {
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
 }
 
 TouchEvent::~TouchEvent() {
   // In ctor TouchEvent(native_event) we call GetTouchId() which in X11
   // platform setups the tracking_id to slot mapping. So in dtor here,
   // if this touch event is a release event, we clear the mapping accordingly.
   if (HasNativeEvent())
     ClearTouchIdIfReleased(native_event());
 }
 
 void TouchEvent::UpdateForRootTransform(
     const gfx::Transform& inverted_root_transform) {
   LocatedEvent::UpdateForRootTransform(inverted_root_transform);
   gfx::DecomposedTransform decomp;
   bool success = gfx::DecomposeTransform(&decomp, inverted_root_transform);
   DCHECK(success);
   if (decomp.scale[0])
     radius_x_ *= decomp.scale[0];
   if (decomp.scale[1])
     radius_y_ *= decomp.scale[1];
 }
 
+int TouchEvent::get_next_touch_event_id() {

[sadrul, 2014/11/27 20:39:30]

Make this an internal function in the anon namespace.

[tdresser, 2014/11/28 18:33:37]

Done.

+  static int id = 0;
+  // We shouldn't have many touch events in existence at a
+  // time. 100000 should give us plenty of headroom.
+  return id++ % 100000;

[sadrul, 2014/11/27 20:39:30]

const int kMaxTouchEventId = 100000;

But why have an upper limit? Why not unsigned long long?

[tdresser, 2014/11/28 18:33:37]

Done.

+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // KeyEvent
 
 // static
 KeyEvent* KeyEvent::last_key_event_ = NULL;
 
 // static
 bool KeyEvent::IsRepeated(const KeyEvent& event) {
   // A safe guard in case if there were continous key pressed events that are
   // not auto repeat.
@@ skipping 377 matching lines @@
                    gfx::PointF(x, y),
                    time_stamp,
                    flags | EF_FROM_TOUCH),
       details_(details) {
 }
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui