summaryrefslogtreecommitdiffstats
path: root/src/core/render_widget_host_view_qt.cpp
diff options
context:
space:
mode:
authorIlia Kirianovskii <ilia.kirianovskii@lgepartner.com>2016-05-04 12:01:43 +0300
committerIlia Kirianovskii <ilia.kirianovskii@lgepartner.com>2016-06-10 04:49:57 +0000
commitee544b396c3c9cbf3c6751e9d733c6b3abcb977b (patch)
tree80ebdd2f46385c530e5bcb64103c1c2d87959c41 /src/core/render_widget_host_view_qt.cpp
parent59d9bf5902f32a41923b8b585c222efab3d6aa50 (diff)
Update scroll information in touch events
Touch events have causesScrollingIfUncanceled flag that is used by TouchEventQueue::TouchMoveSlopSuppressor for determining whether they can be suppressed or not. Previously it was always false what caused the events be suppressed. Then, it was set to true what caused the events cannot be suppressed event if they can. Now the flag can be dinamically changed depending on the result of ui::FilteredGestureProvider::OnTouchEvent. Change-Id: I625a5c5d9b7597e25406e55c461efb7187e7c482 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
-rw-r--r--src/core/render_widget_host_view_qt.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 500a94659..cc0510666 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -838,12 +838,12 @@ void RenderWidgetHostViewQt::sendDelegatedFrameAck()
void RenderWidgetHostViewQt::processMotionEvent(const ui::MotionEvent &motionEvent)
{
- if (!m_gestureProvider.OnTouchEvent(motionEvent).succeeded)
+ auto result = m_gestureProvider.OnTouchEvent(motionEvent);
+ if (!result.succeeded)
return;
- bool causesScrollingIfUncancelled = true;
blink::WebTouchEvent touchEvent = ui::CreateWebTouchEventFromMotionEvent(motionEvent,
- causesScrollingIfUncancelled);
+ result.did_generate_scroll);
m_host->ForwardTouchEventWithLatencyInfo(touchEvent, CreateLatencyInfo(touchEvent));
}