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

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: 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
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 f21691b5f410c96ab5b5217409df69db7b74b894..67fe78ef3e270f8b74d8dc8505732f7c3b8e9d42 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,

Powered by Google App Engine
This is Rietveld 408576698