From d29125ea49a6a7c86ea20a90a1f3fddb9b13d9f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Tue, 9 Apr 2019 22:51:03 +0200
Subject: [PATCH] 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>
---
src/3rdparty | 2 +-
src/core/render_widget_host_view_qt.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/3rdparty b/src/3rdparty
index 8ba90427a..4679cc537 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 8ba90427ae5edea70afbeb02df01f59c8fc366d4
+Subproject commit 4679cc537c8358afa61918d119ceb629593a4d4d
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;
--
GitLab