Unified Gesture Recognizer

ui/events/gestures/gesture_provider_aura.cc

Index: ui/events/gestures/gesture_provider_aura.cc
diff --git a/ui/events/gestures/gesture_provider_aura.cc b/ui/events/gestures/gesture_provider_aura.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1cb3672658a8e8979f6d67fae0d826b2e502fe1f
--- /dev/null
+++ b/ui/events/gestures/gesture_provider_aura.cc
@@ -0,0 +1,70 @@
+// 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/gestures/gesture_provider_aura.h"
+
+#include "base/logging.h"
+#include "ui/events/event.h"
+#include "ui/events/gesture_detection/gesture_config_helper.h"
+#include "ui/events/gesture_detection/gesture_event_data.h"
+
+namespace ui {
+
+GestureProviderAura::GestureProviderAura(GestureProviderAuraClient* client)
+    : client_(client),
+      filtered_gesture_provider_(ui::DefaultGestureProviderConfig(), this) {
+  filtered_gesture_provider_.SetDoubleTapSupportForPlatformEnabled(false);
+}
+
+GestureProviderAura::~GestureProviderAura() {}
+
+bool GestureProviderAura::OnTouchEvent(const TouchEvent& event) {
+  flags_ = event.flags();
+  bool pointer_id_is_active = false;
+  for (size_t i = 0; i < motion_event_.GetPointerCount(); ++i) {
+    if (event.touch_id() != motion_event_.GetPointerId(i))
+      continue;
+    pointer_id_is_active = true;
+    break;
+  }
+
+  if (event.type() == ET_TOUCH_PRESSED && pointer_id_is_active) {
+    // Ignore touch press events if we already believe the pointer is down.
+    return false;
+  } else if (event.type() != ET_TOUCH_PRESSED && !pointer_id_is_active) {
+    // We could have an active touch stream transfered to us, resulting in touch
+    // move or touch up events without associated touch down events. Ignore
+    // them.
+    return false;
+  }
+
+  motion_event_.OnTouch(event);
+  DCHECK(motion_event_.GetPointerCount());

[jdduke (slow), 2014/05/05 16:57:09]

Probably don't need this DCHECK as we don't use the pointer count here
(GestureProvider makes the necessary DCHECK).

[tdresser, 2014/05/05 17:45:14]

Done.

+  bool result = filtered_gesture_provider_.OnTouchEvent(motion_event_);
+  motion_event_.CleanupRemovedTouchPoints(event);
+  return result;
+}
+
+void GestureProviderAura::OnTouchEventAck(bool event_consumed) {
+  return filtered_gesture_provider_.OnTouchEventAck(event_consumed);

[jdduke (slow), 2014/05/05 16:57:09]

Nit: no return.

[tdresser, 2014/05/05 17:45:14]

Done.

+}
+
+void GestureProviderAura::OnGestureEvent(
+    const GestureEventData& gesture) {
+  scoped_ptr<ui::GestureEvent> event(
+      new ui::GestureEvent(gesture.type,
+                           gesture.x,
+                           gesture.y,
+                           flags_,
+                           gesture.time - base::TimeTicks(),
+                           gesture.details,
+                           // ui::GestureEvent stores a bitfield indicating the
+                           // ids of active touch points. This is currently only
+                           // used when one finger is down, and will eventually
+                           // be cleaned up. See crbug.com/366707.
+                           1 << gesture.motion_event_id));
+  client_->OnGestureEvent(event.Pass());
+}
+
+}  // namespace content