gesture recognizer: Remove the touch-event queue.

ui/aura/root_window.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/aura/root_window.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 375 matching lines @@
   point->Offset(location.x(), location.y());
 }
 
 void RootWindow::ConvertPointFromNativeScreen(gfx::Point* point) const {
   gfx::Point location = host_->GetLocationOnNativeScreen();
   point->Offset(-location.x(), -location.y());
   *point = gfx::ToFlooredPoint(
       point->Scale(1 / ui::GetDeviceScaleFactor(layer())));
 }
 
-void RootWindow::AdvanceQueuedTouchEvent(Window* window, bool processed) {
+void RootWindow::ProcessedTouchEvent(ui::TouchEvent* event,
+                                     Window* window,
+                                     ui::EventResult result) {
   scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
-  gestures.reset(gesture_recognizer_->AdvanceTouchQueue(window, processed));
+  gestures.reset(gesture_recognizer_->ProcessTouchEventForGesture(
+      *event, result, window));
   ProcessGestures(gestures.get());
 }
 
 void RootWindow::SetGestureRecognizerForTesting(ui::GestureRecognizer* gr) {
   gesture_recognizer_.reset(gr);
 }
 
 gfx::AcceleratedWidget RootWindow::GetAcceleratedWidget() {
   return host_->GetAcceleratedWidget();
 }
@@ skipping 340 matching lines @@
     mouse_moved_handler_ = NULL;
   if (invisible->Contains(mouse_event_dispatch_target_))
     mouse_event_dispatch_target_ = NULL;
   if (invisible->Contains(event_dispatch_target_))
     event_dispatch_target_ = NULL;
 
   CleanupGestureRecognizerState(invisible);
 }
 
 void RootWindow::CleanupGestureRecognizerState(Window* window) {
-  gesture_recognizer_->FlushTouchQueue(window);
+  gesture_recognizer_->CleanupStateForConsumer(window);
   Windows windows = window->children();
   for (Windows::const_iterator iter = windows.begin();
       iter != windows.end();
       ++iter) {
     CleanupGestureRecognizerState(*iter);
   }
 }
 
 void RootWindow::OnWindowAddedToRootWindow(Window* attached) {
   if (attached->IsVisible() &&
@@ skipping 134 matching lines @@
     if (!target) {
       target = GetEventHandlerForPoint(event->location());
       if (!target)
         return false;
     }
 
     ui::TouchEvent translated_event(
         *event, static_cast<Window*>(this), target);
     result = ProcessTouchEvent(target, &translated_event);
     handled = result != ui::ER_UNHANDLED;
-
-    if (result & ui::ER_ASYNC) {
-      gesture_recognizer_->QueueTouchEventForGesture(target, *event);
-      return true;
-    }
   }
 
   // Get the list of GestureEvents from GestureRecognizer.
   scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
   gestures.reset(gesture_recognizer_->ProcessTouchEventForGesture(
       *event, result, target));
 
   return ProcessGestures(gestures.get()) ? true : handled;
 }
 
@@ skipping 138 matching lines @@
 void RootWindow::UnlockCompositor() {
   DCHECK(compositor_lock_);
   compositor_lock_ = NULL;
   if (draw_on_compositor_unlock_) {
     draw_on_compositor_unlock_ = false;
     ScheduleDraw();
   }
 }
 
 }  // namespace aura