Index: content/browser/renderer_host/web_input_event_aurax11.cc |
=================================================================== |
--- content/browser/renderer_host/web_input_event_aurax11.cc (revision 126124) |
+++ content/browser/renderer_host/web_input_event_aurax11.cc (working copy) |
@@ -300,7 +300,10 @@ |
WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( |
aura::GestureEvent* event) { |
+ |
WebKit::WebGestureEvent gesture_event; |
+ gesture_event.deltaX = event->delta_x(); |
+ gesture_event.deltaY = event->delta_y(); |
switch (event->type()) { |
case ui::ET_GESTURE_TAP: |
@@ -323,12 +326,18 @@ |
break; |
case ui::ET_GESTURE_PINCH_BEGIN: |
gesture_event.type = WebKit::WebInputEvent::GesturePinchBegin; |
+ gesture_event.deltaX = event->scale_x(); |
+ gesture_event.deltaY = event->scale_y(); |
break; |
case ui::ET_GESTURE_PINCH_UPDATE: |
gesture_event.type = WebKit::WebInputEvent::GesturePinchUpdate; |
+ gesture_event.deltaX = event->scale_x(); |
+ gesture_event.deltaY = event->scale_y(); |
break; |
case ui::ET_GESTURE_PINCH_END: |
gesture_event.type = WebKit::WebInputEvent::GesturePinchEnd; |
+ gesture_event.deltaX = event->scale_x(); |
+ gesture_event.deltaY = event->scale_y(); |
break; |
case ui::ET_GESTURE_LONG_PRESS: |
// TODO(tdresser): Integrate long press with WebKit |
@@ -337,10 +346,6 @@ |
NOTREACHED() << "Unknown gesture type: " << event->type(); |
} |
- gesture_event.deltaX = event->delta_x(); |
- gesture_event.deltaY = event->delta_y(); |
- gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); |
- |
return gesture_event; |
} |