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

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

Issue 2943183002: Revert of Re-target wheel events only when a new scroll sequence has started. (Closed)
Patch Set: 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
« no previous file with comments | « content/browser/renderer_host/render_widget_host_input_event_router.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c88f7d63470077bf2808037a847c69179c78be73..fe73293b46648e74e62ba09a7c44d459d65bf308 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
@@ -284,27 +284,7 @@
event->PositionInWidget().y),
target, &transformed_point))
return;
- } else 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->IsMouseLocked() &&
- // !root_view->wheel_scroll_latching_enabled()
+ } else {
target = FindEventTarget(
root_view,
gfx::Point(event->PositionInWidget().x, event->PositionInWidget().y),
@@ -316,12 +296,6 @@
event->SetPositionInWidget(transformed_point.x(), transformed_point.y());
target->ProcessMouseWheelEvent(*event, latency);
-
- DCHECK(root_view->wheel_scroll_latching_enabled() || !wheel_target_.target);
- if (event->phase == blink::WebMouseWheelEvent::kPhaseEnded ||
- event->momentum_phase == blink::WebMouseWheelEvent::kPhaseEnded) {
- wheel_target_.target = nullptr;
- }
}
void RenderWidgetHostInputEventRouter::RouteGestureEvent(
« no previous file with comments | « content/browser/renderer_host/render_widget_host_input_event_router.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698