diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-04-23 17:20:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-25 14:52:46 +0200 |
| commit | 94e445424a6b447d947a8e51bf8ce05f309c6879 (patch) | |
| tree | 513449fe19e9900d6ba6e07c9539740dbd5ff417 /src | |
| parent | c2587b34cb62f4af027bcd8025da9c0f1599dd30 (diff) | |
Clean up cancel fling gesture and latency info for gestures
This is similar to how the aura code changed with the new snapshot.
Change-Id: I57ef8a8a42c6b880988068c0de26df59fcf436fa
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 8e50ea2e5..fa3fe2312 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -144,15 +144,6 @@ static void UpdateWebTouchEventAfterDispatch(blink::WebTouchEvent* event, blink: } } -static blink::WebGestureEvent createFlingCancelEvent(double time_stamp) -{ - blink::WebGestureEvent gesture_event; - gesture_event.timeStampSeconds = time_stamp; - gesture_event.type = blink::WebGestureEvent::GestureFlingCancel; - gesture_event.sourceDevice = blink::WebGestureEvent::Touchscreen; - return gesture_event; -} - static bool shouldSendPinchGesture() { static bool pinchAllowed = CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePinch); @@ -780,7 +771,6 @@ void RenderWidgetHostViewQt::ProcessAckedTouchEvent(const content::TouchEventWit ui::EventResult result = (ack_result == content::INPUT_EVENT_ACK_STATE_CONSUMED) ? ui::ER_HANDLED : ui::ER_UNHANDLED; for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(), end = events.end(); iter != end; ++iter) { - (*iter)->latency()->AddLatencyNumber(ui::INPUT_EVENT_LATENCY_ACKED_TOUCH_COMPONENT, static_cast<int64>(ack_result), 0); scoped_ptr<ui::GestureRecognizer::Gestures> gestures; gestures.reset(m_gestureRecognizer->ProcessTouchEventForGesture(*(*iter), result, this)); ProcessGestures(gestures.get()); @@ -819,14 +809,15 @@ void RenderWidgetHostViewQt::ForwardGestureEventToRenderer(ui::GestureEvent* ges if (webGestureEvent.type == blink::WebGestureEvent::GestureTapDown) { // Chromium does not stop a fling-scroll on tap-down. // So explicitly send an event to stop any in-progress flings. - m_host->ForwardGestureEvent(createFlingCancelEvent(gesture->time_stamp().InSecondsF())); + blink::WebGestureEvent flingCancel = webGestureEvent; + flingCancel.type = blink::WebInputEvent::GestureFlingCancel; + flingCancel.sourceDevice = blink::WebGestureEvent::Touchscreen; + m_host->ForwardGestureEvent(flingCancel); } webGestureEvent.x = gesture->x(); webGestureEvent.y = gesture->y(); - m_host->ForwardGestureEvent(webGestureEvent); - - return; + m_host->ForwardGestureEventWithLatencyInfo(webGestureEvent, *gesture->latency()); } void RenderWidgetHostViewQt::ProcessGestures(ui::GestureRecognizer::Gestures *gestures) |