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

Unified Diff: content/browser/renderer_host/web_input_event_aurax11.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 | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/web_input_event_aurax11.cc
diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc
index 6c0ac5e42ac6fe47efaa841b8e9792e427385251..ccd802164bf82b93bea6aff62c9997dff470854b 100644
--- a/content/browser/renderer_host/web_input_event_aurax11.cc
+++ b/content/browser/renderer_host/web_input_event_aurax11.cc
@@ -263,9 +263,13 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
switch (event->type()) {
case ui::ET_SCROLL:
webkit_event.type = WebKit::WebInputEvent::GestureScrollUpdate;
+ webkit_event.data.scrollUpdate.deltaX = event->x_offset();
+ webkit_event.data.scrollUpdate.deltaY = event->y_offset();
break;
case ui::ET_SCROLL_FLING_START:
webkit_event.type = WebKit::WebInputEvent::GestureFlingStart;
+ webkit_event.data.flingStart.velocityX = event->x_offset();
+ webkit_event.data.flingStart.velocityY = event->y_offset();
break;
case ui::ET_SCROLL_FLING_CANCEL:
webkit_event.type = WebKit::WebInputEvent::GestureFlingCancel;
@@ -276,6 +280,8 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
webkit_event.timeStampSeconds = event->time_stamp().InSecondsF();
+
+ // TODO(rbyers): deltaX/deltaY fields going away. crbug.com/143237
webkit_event.deltaX = event->x_offset();
webkit_event.deltaY = event->y_offset();
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698