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

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: Fix windows build Created 8 years, 5 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..63e1fca7c3c1001e912cdb83ab01ab1299f5dece 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,6 +388,7 @@ 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;
@@ -410,8 +414,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;

Powered by Google App Engine
This is Rietveld 408576698