| Index: content/browser/renderer_host/overscroll_controller.cc
|
| diff --git a/content/browser/renderer_host/overscroll_controller.cc b/content/browser/renderer_host/overscroll_controller.cc
|
| index 51ff7dfc3d4c26952e2021c99779a684ebaed0ac..4df4d3551d6709bd6a30fa4e8ab981b4f67c8135 100644
|
| --- a/content/browser/renderer_host/overscroll_controller.cc
|
| +++ b/content/browser/renderer_host/overscroll_controller.cc
|
| @@ -64,8 +64,7 @@ bool OverscrollController::WillDispatchEvent(
|
| // 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.
|
| - // Send the event through the host when appropriate.
|
| - if (ShouldForwardToHost(event)) {
|
| + if (WebKit::WebInputEvent::isGestureEventType(event.type)) {
|
| const WebKit::WebGestureEvent& gevent =
|
| static_cast<const WebKit::WebGestureEvent&>(event);
|
| return render_widget_host_->ShouldForwardGestureEvent(
|
| @@ -79,8 +78,8 @@ bool OverscrollController::WillDispatchEvent(
|
| SetOverscrollMode(OVERSCROLL_NONE);
|
| // The overscroll gesture status is being reset. If the event is a
|
| // gesture event (from either touchscreen or trackpad), then make sure the
|
| - // host gets the event first (if it didn't already process it).
|
| - if (ShouldForwardToHost(event)) {
|
| + // host gets the event first.
|
| + if (WebKit::WebInputEvent::isGestureEventType(event.type)) {
|
| const WebKit::WebGestureEvent& gevent =
|
| static_cast<const WebKit::WebGestureEvent&>(event);
|
| return render_widget_host_->ShouldForwardGestureEvent(
|
| @@ -367,14 +366,4 @@ void OverscrollController::SetOverscrollMode(OverscrollMode mode) {
|
| delegate_->OnOverscrollModeChange(old_mode, overscroll_mode_);
|
| }
|
|
|
| -bool OverscrollController::ShouldForwardToHost(
|
| - const WebKit::WebInputEvent& event) const {
|
| - if (!WebKit::WebInputEvent::isGestureEventType(event.type))
|
| - return false;
|
| -
|
| - // If the RenderWidgetHost already processed this event, then the event must
|
| - // not be sent again.
|
| - return !render_widget_host_->HasQueuedGestureEvents();
|
| -}
|
| -
|
| } // namespace content
|
|
|