summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2019-12-12 12:35:41 +0100
committerJüri Valdmann <juri.valdmann@qt.io>2019-12-12 14:15:09 +0100
commit670013ee8e38944dc9cbde73afa3706ded5dcb96 (patch)
tree85e0a76d00df8648d0f01f14b177686af44fdd63
parentf5c8d1df04b42ac666a9a7e56a5852d01d48a555 (diff)
Fix touch flinging in viz mode
FlingScheduler, in viz mode, is not able to progress the animation unless it has access to our ui::Compositor in RHWVQt for observing OnAnimationStep. Add a GetCompositor virtual method to RHWV and override in RHWVQt. Fixes: QTBUG-80089 Change-Id: I4f52a83d29f5ae4c7c9e8cc4908384d1c7e81a82 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/render_widget_host_view_qt.cpp5
-rw-r--r--src/core/render_widget_host_view_qt.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 15cc5174e..0adf8091f 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -1901,6 +1901,11 @@ std::unique_ptr<content::SyntheticGestureTarget> RenderWidgetHostViewQt::CreateS
return nullptr;
}
+ui::Compositor *RenderWidgetHostViewQt::GetCompositor()
+{
+ return m_uiCompositor.get();
+}
+
void RenderWidgetHostViewQt::UpdateNeedsBeginFramesInternal()
{
if (m_enableViz)
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 0e9d54b19..dc6ccc8df 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -174,6 +174,7 @@ public:
void ResetFallbackToFirstNavigationSurface() override;
void DidStopFlinging() override;
std::unique_ptr<content::SyntheticGestureTarget> CreateSyntheticGestureTarget() override;
+ ui::Compositor *GetCompositor() override;
// Overridden from ui::GestureProviderClient.
void OnGestureEvent(const ui::GestureEventData& gesture) override;