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

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

Issue 10895024: Use new gesture event fields in more places (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CL diff to be against ToT (not one of my other branches) Created 8 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/browser/renderer_host/render_widget_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/gesture_event_filter.cc
diff --git a/content/browser/renderer_host/gesture_event_filter.cc b/content/browser/renderer_host/gesture_event_filter.cc
index b59cc2196237178426ceb2842c4e0c051b2d924a..a050d411db8cf9c0d1cf2188810be2f7d21f9c3f 100644
--- a/content/browser/renderer_host/gesture_event_filter.cc
+++ b/content/browser/renderer_host/gesture_event_filter.cc
@@ -170,6 +170,11 @@ void GestureEventFilter::MergeOrInsertScrollEvent(
if (coalesced_gesture_events_.size() > 1 &&
last_gesture_event->type == gesture_event.type &&
last_gesture_event->modifiers == gesture_event.modifiers) {
+ last_gesture_event->data.scrollUpdate.deltaX +=
+ gesture_event.data.scrollUpdate.deltaX;
+ last_gesture_event->data.scrollUpdate.deltaY +=
+ gesture_event.data.scrollUpdate.deltaY;
+ // TODO(rbyers): deltaX/deltaY fields going away. crbug.com/143237
last_gesture_event->deltaX += gesture_event.deltaX;
last_gesture_event->deltaY += gesture_event.deltaY;
DLOG_IF(WARNING,
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698