diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-04-09 22:51:03 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-04-11 09:38:33 +0000 |
| commit | d29125ea49a6a7c86ea20a90a1f3fddb9b13d9f4 (patch) | |
| tree | 3b625dfa615a3f44c0f973893acd87b50763e857 | |
| parent | 43eb77cb0d93020ce7db27fa2ac8dc7ef7738709 (diff) | |
Use CompositorFrameMetadata::root_layer_size for contentsSize
This was changed as an adaptation to Chromium 70, but turns out
to be causing some regressions.
Updates Chromium to include the changes there.
Change-Id: I1e507bc2c51975c85afccd4346b02c43f5a44478
Fixes: QTBUG-74847
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 8ba90427ae5edea70afbeb02df01f59c8fc366d +Subproject 4679cc537c8358afa61918d119ceb629593a4d4 diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 414fc6582..8b1a9075b 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -666,9 +666,9 @@ void RenderWidgetHostViewQt::DidCreateNewRendererCompositorFrameSink(viz::mojom: void RenderWidgetHostViewQt::SubmitCompositorFrame(const viz::LocalSurfaceId &local_surface_id, viz::CompositorFrame frame, base::Optional<viz::HitTestRegionList>) { bool scrollOffsetChanged = (m_lastScrollOffset != frame.metadata.root_scroll_offset); - bool contentsSizeChanged = (m_lastContentsSize != frame.metadata.scrollable_viewport_size); + bool contentsSizeChanged = (m_lastContentsSize != frame.metadata.root_layer_size); m_lastScrollOffset = frame.metadata.root_scroll_offset; - m_lastContentsSize = frame.metadata.scrollable_viewport_size; + m_lastContentsSize = frame.metadata.root_layer_size; // Force to process swap messages uint32_t frame_token = frame.metadata.frame_token; |