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

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

Issue 2842203002: Forward GestureFlingStart in OOPIF, re-enable DCHECK. (Closed)
Patch Set: Add test descriptions, comment. 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 7f11483bd5fa7eb8b92a9189357d13943070e64a..7baa7855193d2e4db8c6a9e73d6087d837b90527 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
@@ -556,7 +556,8 @@ void RenderWidgetHostInputEventRouter::BubbleScrollEvent(
// including bubbling, based on GestureScrollBegin.
DCHECK(target_view);
DCHECK(event.GetType() == blink::WebInputEvent::kGestureScrollUpdate ||
- event.GetType() == blink::WebInputEvent::kGestureScrollEnd);
+ event.GetType() == blink::WebInputEvent::kGestureScrollEnd ||
+ event.GetType() == blink::WebInputEvent::kGestureFlingStart);
// DCHECK_XNOR the current and original bubble targets. Both should be set
// if a bubbling gesture scroll is in progress.
DCHECK(!first_bubbling_scroll_target_.target ==
@@ -570,7 +571,8 @@ void RenderWidgetHostInputEventRouter::BubbleScrollEvent(
if (target_view == first_bubbling_scroll_target_.target) {
bubbling_gesture_scroll_target_.target->ProcessGestureEvent(event,
latency_info);
- if (event.GetType() == blink::WebInputEvent::kGestureScrollEnd) {
+ if (event.GetType() == blink::WebInputEvent::kGestureScrollEnd ||
+ event.GetType() == blink::WebInputEvent::kGestureFlingStart) {
first_bubbling_scroll_target_.target = nullptr;
bubbling_gesture_scroll_target_.target = nullptr;
}
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698