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

Unified Diff: content/common/input/event_with_latency_info.cc

Issue 2257023004: Coalesced mouse wheel event has the position of the most recent event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: a more verbose unittest. Created 4 years, 4 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 | « no previous file | content/common/input/event_with_latency_info_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/input/event_with_latency_info.cc
diff --git a/content/common/input/event_with_latency_info.cc b/content/common/input/event_with_latency_info.cc
index a2b306b7eaaa71e6683cc6c23f287f498f6891a2..9aec6328399900b210a0efcd39eb50d05d75160b 100644
--- a/content/common/input/event_with_latency_info.cc
+++ b/content/common/input/event_with_latency_info.cc
@@ -97,10 +97,19 @@ void Coalesce(const WebMouseWheelEvent& event_to_coalesce,
GetUnacceleratedDelta(event->deltaY, event->accelerationRatioY) +
GetUnacceleratedDelta(event_to_coalesce.deltaY,
event_to_coalesce.accelerationRatioY);
- event->deltaX += event_to_coalesce.deltaX;
- event->deltaY += event_to_coalesce.deltaY;
- event->wheelTicksX += event_to_coalesce.wheelTicksX;
- event->wheelTicksY += event_to_coalesce.wheelTicksY;
+ float old_deltaX = event->deltaX;
+ float old_deltaY = event->deltaY;
+ float old_wheelTicksX = event->wheelTicksX;
+ float old_wheelTicksY = event->wheelTicksY;
+ float old_movementX = event->movementX;
+ float old_movementY = event->movementY;
+ *event = event_to_coalesce;
+ event->deltaX += old_deltaX;
+ event->deltaY += old_deltaY;
+ event->wheelTicksX += old_wheelTicksX;
+ event->wheelTicksY += old_wheelTicksY;
+ event->movementX += old_movementX;
+ event->movementY += old_movementY;
event->accelerationRatioX =
GetAccelerationRatio(event->deltaX, unaccelerated_x);
event->accelerationRatioY =
« no previous file with comments | « no previous file | content/common/input/event_with_latency_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698