diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-10-31 12:23:26 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-02 05:12:59 +0000 |
| commit | 41f8b4883afddf2868beacedaf8270553237ceaf (patch) | |
| tree | 1b4dd130ed1af36732e2698fe5a223c105caf92b | |
| parent | 335414d721c2c8748a48b074b2616503bdeeacf5 (diff) | |
Fix quicknanobrowser crash on startup
Don't call SynchronizeVisualProperties from updatePaintNode
Fixes: QTBUG-71430
Change-Id: I6bd231b22c0473f9fd47ca3cdbcb8262f314bd5b
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 1582cf733..1c5382fe7 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -690,6 +690,11 @@ void RenderWidgetHostViewQt::SubmitCompositorFrame(const viz::LocalSurfaceId &lo m_adapterClient->updateScrollPosition(toQt(m_lastScrollOffset)); if (contentsSizeChanged) m_adapterClient->updateContentsSize(toQt(m_lastContentsSize)); + + if (m_pendingResize && host()) { + if (host()->SynchronizeVisualProperties()) + m_pendingResize = false; + } } void RenderWidgetHostViewQt::GetScreenInfo(content::ScreenInfo *results) const @@ -890,10 +895,6 @@ void RenderWidgetHostViewQt::OnDidUpdateVisualPropertiesComplete(const cc::Rende QSGNode *RenderWidgetHostViewQt::updatePaintNode(QSGNode *oldNode) { - if (m_pendingResize && host()) { - if (host()->SynchronizeVisualProperties()) - m_pendingResize = false; - } return m_compositor->updatePaintNode(oldNode); } |