Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(798)

Unified Diff: content/browser/renderer_host/render_widget_host_input_event_router.cc

Issue 2785533003: Animated scroll shouldn't consume unhandled scrolls for OOPIFs. (Closed)
Patch Set: Fix Android compile. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_input_event_router.cc
diff --git a/content/browser/renderer_host/render_widget_host_input_event_router.cc b/content/browser/renderer_host/render_widget_host_input_event_router.cc
index f5553526d6c6834dbf18559dc4fd621d31a326c5..cbb43d2e9f792447c95e256d9a6f423d2304df7e 100644
--- a/content/browser/renderer_host/render_widget_host_input_event_router.cc
+++ b/content/browser/renderer_host/render_widget_host_input_event_router.cc
@@ -727,7 +727,8 @@ void RenderWidgetHostInputEventRouter::RouteTouchscreenGestureEvent(
// send a GestureScrollBegin, as by the time we see GesturePinchBegin there
// should have been one.
if (root_view != touchscreen_gesture_target_.target &&
- !rwhi->is_in_touchscreen_gesture_scroll()) {
+ !rwhi->is_in_gesture_scroll(
+ blink::WebGestureDevice::kWebGestureDeviceTouchscreen)) {
gesture_pinch_did_send_scroll_begin_ = true;
SendGestureScrollBegin(root_view, *event);
}
@@ -743,7 +744,8 @@ void RenderWidgetHostInputEventRouter::RouteTouchscreenGestureEvent(
static_cast<RenderWidgetHostImpl*>(root_view->GetRenderWidgetHost());
if (root_view != touchscreen_gesture_target_.target &&
gesture_pinch_did_send_scroll_begin_ &&
- rwhi->is_in_touchscreen_gesture_scroll()) {
+ rwhi->is_in_gesture_scroll(
+ blink::WebGestureDevice::kWebGestureDeviceTouchscreen)) {
SendGestureScrollEnd(root_view, *event);
}
gesture_pinch_did_send_scroll_begin_ = false;

Powered by Google App Engine
This is Rietveld 408576698