events: Clean up dispatching code for touch-events.

ui/base/gestures/gesture_sequence.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/base/gestures/gesture_sequence.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 12 matching lines @@
 // Signature.
 enum TouchState {
   TS_RELEASED,
   TS_PRESSED,
   TS_MOVED,
   TS_STATIONARY,
   TS_CANCELLED,
   TS_UNKNOWN,
 };
 
-// ui::TouchStatus is mapped to TouchStatusInternal to simply indicate whether a
+// ui::EventResult is mapped to TouchStatusInternal to simply indicate whether a
 // processed touch-event should affect gesture-recognition or not.
 enum TouchStatusInternal {
   TSI_NOT_PROCESSED,  // The touch-event should take-part into
                       // gesture-recognition only if the touch-event has not
                       // been processed.
 
   TSI_PROCESSED,      // The touch-event should affect gesture-recognition only
                       // if the touch-event has been processed. For example,,
                       // this means that a JavaScript touch handler called
                       // |preventDefault| on the associated touch event
@@ skipping 256 matching lines @@
       long_press_timer_(CreateTimer()),
       point_count_(0),
       helper_(helper) {
 }
 
 GestureSequence::~GestureSequence() {
 }
 
 GestureSequence::Gestures* GestureSequence::ProcessTouchEventForGesture(
     const TouchEvent& event,
-    ui::TouchStatus status) {
+    EventResult result) {
   StopLongPressTimerIfRequired(event);
   last_touch_location_ = event.location();
-  if (status == ui::TOUCH_STATUS_QUEUED ||
-      status == ui::TOUCH_STATUS_QUEUED_END)
+  if (result & ER_ASYNC)
     return NULL;
 
   // Set a limit on the number of simultaneous touches in a gesture.
   if (event.touch_id() >= kMaxGesturePoints)
     return NULL;
 
   if (event.type() == ui::ET_TOUCH_PRESSED) {
     if (point_count_ == kMaxGesturePoints)
       return NULL;
     GesturePoint* new_point = &points_[event.touch_id()];
@@ skipping 19 matching lines @@
   RecreateBoundingBox();
   flags_ = event.flags();
   const int point_id = point.point_id();
   if (point_id < 0)
     return NULL;
 
   // Send GESTURE_BEGIN for any touch pressed.
   if (event.type() == ui::ET_TOUCH_PRESSED)
     AppendBeginGestureEvent(point, gestures.get());
 
-  TouchStatusInternal status_internal = (status == ui::TOUCH_STATUS_UNKNOWN) ?
+  CHECK_NE(ER_ASYNC, result);
+  TouchStatusInternal status_internal = (result == ER_UNHANDLED) ?
       TSI_NOT_PROCESSED : TSI_PROCESSED;
 
   EdgeStateSignatureType signature = Signature(state_, point_id,
       event.type(), status_internal);
 
   if (signature == GST_INVALID)
     signature = Signature(state_, point_id, event.type(), TSI_ALWAYS);
 
   switch (signature) {
     case GST_INVALID:
@@ skipping 205 matching lines @@
       return &point;
   }
   NOTREACHED();
   return NULL;
 }
 
 bool GestureSequence::IsSecondTouchDownCloseEnoughForTwoFingerTap() {
   gfx::Point p1 = GetPointByPointId(0)->last_touch_position();
   gfx::Point p2 = GetPointByPointId(1)->last_touch_position();
   double max_distance =
-      ui::GestureConfiguration::max_distance_for_two_finger_tap_in_pixels();
+      GestureConfiguration::max_distance_for_two_finger_tap_in_pixels();
   double distance = (p1.x() - p2.x()) * (p1.x() - p2.x()) +
       (p1.y() - p2.y()) * (p1.y() - p2.y());
   if (distance < max_distance * max_distance)
     return true;
   return false;
 }
 
 GestureEvent* GestureSequence::CreateGestureEvent(
     const GestureEventDetails& details,
     const gfx::Point& location,
@@ skipping 490 matching lines @@
     return;
 
   // Since long press timer has been started, there should be a non-NULL point.
   const GesturePoint* point = GetPointByPointId(0);
   if (!ui::gestures::IsInsideManhattanSquare(point->first_touch_position(),
       event.location()))
     long_press_timer_->Stop();
 }
 
 }  // namespace ui