MouseWheelEventQueue should respect ScrollBegin/End state from RenderWidgetHost.

content/browser/renderer_host/input/mock_input_router_client.cc

 // Copyright 2013 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/input/mock_input_router_client.h"
 
 #include "content/browser/renderer_host/input/input_router.h"
 #include "content/common/input/input_event.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 
 namespace content {
 
 MockInputRouterClient::MockInputRouterClient()
     : input_router_(NULL),
       in_flight_event_count_(0),
       has_touch_handler_(false),
+      is_in_gesture_scroll_(false),
       filter_state_(INPUT_EVENT_ACK_STATE_NOT_CONSUMED),
       filter_input_event_called_(false),
-      did_flush_called_count_(0) {
-}
+      did_flush_called_count_(0) {}
 
 MockInputRouterClient::~MockInputRouterClient() {}
 
 InputEventAckState MockInputRouterClient::FilterInputEvent(
     const WebInputEvent& input_event,
     const ui::LatencyInfo& latency_info) {
   filter_input_event_called_ = true;
   last_filter_event_.reset(new InputEvent(input_event, latency_info));
   return filter_state_;
 }
@@ skipping 24 matching lines @@
 
 void MockInputRouterClient::DidStopFlinging() {
 }
 
 void MockInputRouterClient::ForwardGestureEventWithLatencyInfo(
     const blink::WebGestureEvent& gesture_event,
     const ui::LatencyInfo& latency_info) {
   if (input_router_)
     input_router_->SendGestureEvent(
         GestureEventWithLatencyInfo(gesture_event, latency_info));
+  if (gesture_event.GetType() == blink::WebInputEvent::kGestureScrollBegin &&
+      !gesture_event.data.scroll_begin.synthetic) {
+    is_in_gesture_scroll_ = true;
+  } else if (gesture_event.GetType() ==
+                 blink::WebInputEvent::kGestureScrollEnd &&
+             !gesture_event.data.scroll_end.synthetic) {
+    is_in_gesture_scroll_ = false;
+  }
+}
+
+bool MockInputRouterClient::is_in_gesture_scroll(
+    blink::WebGestureDevice device) {
+  return is_in_gesture_scroll_;
 }
 
 bool MockInputRouterClient::GetAndResetFilterEventCalled() {
   bool filter_input_event_called = filter_input_event_called_;
   filter_input_event_called_ = false;
   return filter_input_event_called;
 }
 
 size_t MockInputRouterClient::GetAndResetDidFlushCount() {
   size_t did_flush_called_count = did_flush_called_count_;
   did_flush_called_count_ = 0;
   return did_flush_called_count;
 }
 
 ui::DidOverscrollParams MockInputRouterClient::GetAndResetOverscroll() {
   ui::DidOverscrollParams overscroll;
   std::swap(overscroll_, overscroll);
   return overscroll;
 }
 
 }  // namespace content