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

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

Issue 2928793003: Re-target wheel events only when a new scroll sequence has started. (Closed)
Patch Set: browser test updated. Created 3 years, 6 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 fe73293b46648e74e62ba09a7c44d459d65bf308..091506016280e2ced7d67c6a169b856f704b10d0 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
@@ -285,10 +285,32 @@ void RenderWidgetHostInputEventRouter::RouteMouseWheelEvent(
target, &transformed_point))
return;
} else {
- target = FindEventTarget(
- root_view,
- gfx::Point(event->PositionInWidget().x, event->PositionInWidget().y),
- &transformed_point);
+ if (root_view->wheel_scroll_latching_enabled()) {
+ if (event->phase == blink::WebMouseWheelEvent::kPhaseBegan) {
+ wheel_target_.target =
+ FindEventTarget(root_view,
+ gfx::Point(event->PositionInWidget().x,
+ event->PositionInWidget().y),
+ &transformed_point);
+ wheel_target_.delta =
+ transformed_point - gfx::Point(event->PositionInWidget().x,
+ event->PositionInWidget().y);
+ target = wheel_target_.target;
+ } else {
+ if (wheel_target_.target) {
+ target = wheel_target_.target;
+ transformed_point = gfx::Point(event->PositionInWidget().x,
+ event->PositionInWidget().y) +
+ wheel_target_.delta;
+ }
+ }
+
+ } else { // !root_view->wheel_scroll_latching_enabled()
+ target = FindEventTarget(
+ root_view,
+ gfx::Point(event->PositionInWidget().x, event->PositionInWidget().y),
+ &transformed_point);
+ }
}
if (!target)
@@ -296,6 +318,11 @@ void RenderWidgetHostInputEventRouter::RouteMouseWheelEvent(
event->SetPositionInWidget(transformed_point.x(), transformed_point.y());
target->ProcessMouseWheelEvent(*event, latency);
+ if (root_view->wheel_scroll_latching_enabled() &&
+ (event->phase == blink::WebMouseWheelEvent::kPhaseEnded ||
+ event->momentum_phase == blink::WebMouseWheelEvent::kPhaseEnded)) {
+ wheel_target_.target = nullptr;
tdresser 2017/06/09 18:13:11 This isn't needed, is it?
sahel 2017/06/13 15:43:20 By resetting the target on end events we won't sen
tdresser 2017/06/13 15:48:50 Maybe leave it, and add a DCHECK that the target i
sahel 2017/06/14 19:09:43 We agreed to leave it as it is since sometimes Fin
+ }
}
void RenderWidgetHostInputEventRouter::RouteGestureEvent(

Powered by Google App Engine
This is Rietveld 408576698