Pass tap count (1 or 2) with tap gesture events

content/browser/renderer_host/web_input_event_aurax11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Portions based heavily on:
 // third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.cpp
 //
 /*
  * Copyright (C) 2006-2011 Google Inc. All rights reserved.
  *
@@ skipping 346 matching lines @@
   return webkit_event;
 }
 
 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
     aura::GestureEvent* event) {
   WebKit::WebGestureEvent gesture_event;
 
   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;
       break;
     case ui::ET_GESTURE_DOUBLE_TAP:
       gesture_event.type = WebKit::WebInputEvent::GestureDoubleTap;
       break;
     case ui::ET_GESTURE_SCROLL_BEGIN:
       gesture_event.type = WebKit::WebInputEvent::GestureScrollBegin;
       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;
       break;
     case ui::ET_GESTURE_PINCH_BEGIN:
       gesture_event.type = WebKit::WebInputEvent::GesturePinchBegin;
       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;

[sadrul, 2012/08/03 01:50:33]

I believe deltaX/Y needs to be set to details().velocity_x()/y() here too

[Rick Byers, 2012/08/03 14:51:54]

Done.

       break;
     case ui::ET_SCROLL_FLING_CANCEL:
       gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel;
       break;
     case ui::ET_GESTURE_LONG_PRESS:
       gesture_event.type = WebKit::WebInputEvent::GestureLongPress;
       break;
     case ui::ET_GESTURE_TWO_FINGER_TAP:
       gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap;
       break;
     case ui::ET_GESTURE_BEGIN:
     case ui::ET_GESTURE_END:
     case ui::ET_GESTURE_MULTIFINGER_SWIPE:
       break;
     default:
       NOTREACHED() << "Unknown gesture type: " << event->type();
   }
 
   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;
 }
 
 WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent(
     aura::TouchEvent* event, WebKit::WebTouchEvent* web_event) {
   WebKit::WebTouchPoint* point = NULL;
   switch (event->type()) {
     case ui::ET_TOUCH_PRESSED:
@@ skipping 57 matching lines @@
 
   // Update the type of the touch event.
   web_event->type = TouchEventTypeFromEvent(event);
   web_event->timeStampSeconds = event->time_stamp().InSecondsF();
   web_event->modifiers = EventFlagsToWebEventModifiers(event->flags());
 
   return point;
 }
 
 }  // namespace content