diff options
Diffstat (limited to 'chromium/ui/events/blink/blink_event_util.cc')
| -rw-r--r-- | chromium/ui/events/blink/blink_event_util.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/ui/events/blink/blink_event_util.cc b/chromium/ui/events/blink/blink_event_util.cc index 6d3fda87397..a2108c64397 100644 --- a/chromium/ui/events/blink/blink_event_util.cc +++ b/chromium/ui/events/blink/blink_event_util.cc @@ -754,6 +754,8 @@ WebGestureEvent CreateWebGestureEvent(const GestureEventDetails& details, gesture.data.tap.tap_count = details.tap_count(); gesture.data.tap.width = details.bounding_box_f().width(); gesture.data.tap.height = details.bounding_box_f().height(); + gesture.SetNeedsWheelEvent(source_device == + blink::kWebGestureDeviceTouchpad); break; case ET_GESTURE_TAP: gesture.SetType(WebInputEvent::kGestureTap); @@ -1077,13 +1079,13 @@ EventType WebEventTypeToEventType(WebInputEvent::Type type) { return ET_TOUCH_CANCELLED; case WebInputEvent::kTouchScrollStarted: case WebInputEvent::kPointerDown: - return ET_POINTER_DOWN; + return ET_TOUCH_PRESSED; case WebInputEvent::kPointerUp: - return ET_POINTER_UP; + return ET_TOUCH_RELEASED; case WebInputEvent::kPointerMove: - return ET_POINTER_MOVED; + return ET_TOUCH_MOVED; case WebInputEvent::kPointerCancel: - return ET_POINTER_CANCELLED; + return ET_TOUCH_CANCELLED; default: return ET_UNKNOWN; } |