events: Clean up dispatching code for touch-events.

content/browser/renderer_host/render_widget_host_view_aura.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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 93 matching lines @@
       reinterpret_cast<RenderWidgetHostViewAura*>(param);
 
   HWND parent =
       widget->GetNativeView()->GetRootWindow()->GetAcceleratedWidget();
   if (GetProp(window, kWidgetOwnerProperty) == widget)
     SetParent(window, parent);
   return TRUE;
 }
 #endif
 
-ui::TouchStatus DecideTouchStatus(const WebKit::WebTouchEvent& event,
-                                  WebKit::WebTouchPoint* point) {
-  if (event.type == WebKit::WebInputEvent::TouchEnd &&
-      event.touchesLength == 0)
-    return ui::TOUCH_STATUS_QUEUED_END;
-
-  return ui::TOUCH_STATUS_QUEUED;
-}
-
 void UpdateWebTouchEventAfterDispatch(WebKit::WebTouchEvent* event,
                                       WebKit::WebTouchPoint* point) {
   if (point->state != WebKit::WebTouchPoint::StateReleased)
     return;
   --event->touchesLength;
   for (unsigned i = point - event->touches;
        i < event->touchesLength;
        ++i) {
     event->touches[i] = event->touches[i + 1];
   }
@@ skipping 1406 matching lines @@
 
   // Needed to propagate mouse event to native_tab_contents_view_aura.
   // TODO(pkotwicz): Find a better way of doing this.
   if (window_->parent()->delegate())
     window_->parent()->delegate()->OnMouseEvent(event);
 
   // Return true so that we receive released/drag events.
   return ui::ER_HANDLED;
 }
 
-ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent(
-    ui::TouchEvent* event) {
+ui::EventResult RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) {
   TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnTouchEvent");
   // Update the touch event first.
   WebKit::WebTouchPoint* point = UpdateWebTouchEvent(event,
       &touch_event_);
 
   // Forward the touch event only if a touch point was updated, and there's a
   // touch-event handler in the page.
   if (point && host_->has_touch_handler()) {
     host_->ForwardTouchEvent(touch_event_);
     UpdateWebTouchEventAfterDispatch(&touch_event_, point);
-    return DecideTouchStatus(touch_event_, point);
+    return ui::ER_ASYNC;
   }
 
-  return ui::TOUCH_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 ui::EventResult RenderWidgetHostViewAura::OnGestureEvent(
     ui::GestureEvent* event) {
   TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnGestureEvent");
   // Pinch gestures are currently disabled by default. See crbug.com/128477.
   if ((event->type() == ui::ET_GESTURE_PINCH_BEGIN ||
       event->type() == ui::ET_GESTURE_PINCH_UPDATE ||
       event->type() == ui::ET_GESTURE_PINCH_END) && !ShouldSendPinchGesture()) {
     return ui::ER_CONSUMED;
@@ skipping 306 matching lines @@
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content