Move OverscrollController to RenderWidgetHostViewAura

content/browser/renderer_host/overscroll_controller.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/overscroll_controller.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/renderer_host/overscroll_controller_delegate.h"
 #include "content/public/browser/overscroll_configuration.h"
@@ skipping 16 matching lines @@
     : overscroll_mode_(OVERSCROLL_NONE),
       scroll_state_(STATE_UNKNOWN),
       overscroll_delta_x_(0.f),
       overscroll_delta_y_(0.f),
       delegate_(NULL) {
 }
 
 OverscrollController::~OverscrollController() {
 }
 
-OverscrollController::Disposition OverscrollController::DispatchEvent(
-    const blink::WebInputEvent& event,
-    const ui::LatencyInfo& latency_info) {
+bool OverscrollController::WillHandleEvent(const blink::WebInputEvent& event) {
   if (scroll_state_ != STATE_UNKNOWN) {
     switch (event.type) {
       case blink::WebInputEvent::GestureScrollEnd:
       case blink::WebInputEvent::GestureFlingStart:
         scroll_state_ = STATE_UNKNOWN;
         break;
 
       case blink::WebInputEvent::MouseWheel: {
         const blink::WebMouseWheelEvent& wheel =
             static_cast<const blink::WebMouseWheelEvent&>(event);
@@ skipping 10 matching lines @@
             blink::WebInputEvent::isKeyboardEventType(event.type)) {
           scroll_state_ = STATE_UNKNOWN;
         }
         break;
     }
   }
 
   if (DispatchEventCompletesAction(event)) {
     CompleteAction();
 
-    // If the overscroll was caused by touch-scrolling, then the gesture event
-    // that completes the action needs to be sent to the renderer, because the
-    // touch-scrolls maintain state in the renderer side (in the compositor, for
-    // example), and the event that completes this action needs to be sent to
-    // the renderer so that those states can be updated/reset appropriately.
-    if (blink::WebInputEvent::isGestureEventType(event.type)) {
-      // A gesture-event isn't sent to the GestureEventQueue when overscroll is
-      // in progress. So dispatch the event through the RenderWidgetHost so that
-      // it can reach the GestureEventQueue.
-      return SHOULD_FORWARD_TO_GESTURE_QUEUE;
-    }
-
-    return SHOULD_FORWARD_TO_RENDERER;
+    // Let the event be dispatched to the renderer.
+    return false;
   }
 
   if (overscroll_mode_ != OVERSCROLL_NONE && DispatchEventResetsState(event)) {
     SetOverscrollMode(OVERSCROLL_NONE);
-    if (blink::WebInputEvent::isGestureEventType(event.type)) {
-      // A gesture-event isn't sent to the GestureEventQueue when overscroll is
-      // in progress. So dispatch the event through the RenderWidgetHost so that
-      // it can reach the GestureEventQueue.
-      return SHOULD_FORWARD_TO_GESTURE_QUEUE;
-    }
 
     // Let the event be dispatched to the renderer.
-    return SHOULD_FORWARD_TO_RENDERER;
+    return false;
   }
 
   if (overscroll_mode_ != OVERSCROLL_NONE) {
     // Consume the event only if it updates the overscroll state.
     if (ProcessEventForOverscroll(event))
-      return CONSUMED;
+      return true;
   }
 
-  return SHOULD_FORWARD_TO_RENDERER;
+  return false;
 }
 
 void OverscrollController::ReceivedEventACK(const blink::WebInputEvent& event,
                                             bool processed) {
   if (processed) {
     // If a scroll event is consumed by the page, i.e. some content on the page
     // has been scrolled, then there is not going to be an overscroll gesture,
     // until the current scroll ends, and a new scroll gesture starts.
     if (scroll_state_ == STATE_UNKNOWN &&
         (event.type == blink::WebInputEvent::MouseWheel ||
@@ skipping 254 matching lines @@
   overscroll_mode_ = mode;
   if (overscroll_mode_ == OVERSCROLL_NONE)
     overscroll_delta_x_ = overscroll_delta_y_ = 0.f;
   else
     scroll_state_ = STATE_OVERSCROLLING;
   if (delegate_)
     delegate_->OnOverscrollModeChange(old_mode, overscroll_mode_);
 }
 
 }  // namespace content