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 f07efab61f4fe1504186974481be50128de69345..3b0fc3297b9e96b3ac91bb131dd4545e2b40da57 100644 |
--- a/content/browser/renderer_host/overscroll_controller.cc |
+++ b/content/browser/renderer_host/overscroll_controller.cc |
@@ -4,6 +4,7 @@ |
#include "content/browser/renderer_host/overscroll_controller.h" |
+#include "content/browser/renderer_host/input/gesture_event_filter.h" |
#include "content/browser/renderer_host/overscroll_controller_delegate.h" |
#include "content/browser/renderer_host/render_widget_host_impl.h" |
#include "content/public/browser/overscroll_configuration.h" |
@@ -104,6 +105,8 @@ bool OverscrollController::WillDispatchEvent( |
void OverscrollController::ReceivedEventACK(const WebKit::WebInputEvent& event, |
bool processed) { |
+ if (GestureEventFilter::IsGestureEventTypeAsync(event.type)) |
jdduke (slow)
2013/09/30 15:42:56
Make this a DCHECK(!GestureEventFilter::IsGestureE
tdresser
2013/09/30 18:05:03
Done.
|
+ return; |
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, |