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

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

Issue 10824158: Pass tap count (1 or 2) with tap gesture events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk 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/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 4e7154e208f6e187034ccd3a9154112f089e7bff..a7aea7c80096bf1dde864aa5a2fbd04cc2a71dfc 100644
--- a/content/browser/renderer_host/web_input_event_aurax11.cc
+++ b/content/browser/renderer_host/web_input_event_aurax11.cc
@@ -364,6 +364,7 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
switch (event->type()) {
case ui::ET_GESTURE_TAP:
gesture_event.type = WebKit::WebInputEvent::GestureTap;
+ gesture_event.deltaX = event->details().tap_count();
break;
case ui::ET_GESTURE_TAP_DOWN:
gesture_event.type = WebKit::WebInputEvent::GestureTapDown;
@@ -376,6 +377,8 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
break;
case ui::ET_GESTURE_SCROLL_UPDATE:
gesture_event.type = WebKit::WebInputEvent::GestureScrollUpdate;
+ gesture_event.deltaX = event->details().scroll_x();
+ gesture_event.deltaY = event->details().scroll_y();
break;
case ui::ET_GESTURE_SCROLL_END:
gesture_event.type = WebKit::WebInputEvent::GestureScrollEnd;
@@ -385,12 +388,15 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
break;
case ui::ET_GESTURE_PINCH_UPDATE:
gesture_event.type = WebKit::WebInputEvent::GesturePinchUpdate;
+ gesture_event.deltaX = event->details().scale();
break;
case ui::ET_GESTURE_PINCH_END:
gesture_event.type = WebKit::WebInputEvent::GesturePinchEnd;
break;
case ui::ET_SCROLL_FLING_START:
gesture_event.type = WebKit::WebInputEvent::GestureFlingStart;
+ gesture_event.deltaX = event->details().velocity_x();
+ gesture_event.deltaY = event->details().velocity_y();
break;
case ui::ET_SCROLL_FLING_CANCEL:
gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel;
@@ -410,8 +416,6 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
}
gesture_event.boundingBox = event->details().bounding_box();
- gesture_event.deltaX = event->details().generic_x();
- gesture_event.deltaY = event->details().generic_y();
gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
return gesture_event;
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.cc ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698