From 33fc33aa94d4add0878ec30dc818e34e1dd3cc2a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 7 Sep 2022 13:12:05 +0200 Subject: BASELINE: Update Chromium to 104.0.5112.120 Change-Id: I5d2726c2ab018d75d055739b6ba64317904f05bb Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438935 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'chromium/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc') diff --git a/chromium/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc b/chromium/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc index 8f95db0272c..6c8b645452b 100644 --- a/chromium/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc +++ b/chromium/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc @@ -20,7 +20,7 @@ namespace ui { namespace { constexpr uint32_t kMinVersion = 1; -constexpr uint32_t kMaxVersion = 29; +constexpr uint32_t kMaxVersion = 34; } // static @@ -48,6 +48,13 @@ void WaylandZAuraShell::Instantiate(WaylandConnection* connection, connection->zaura_shell_ = std::make_unique(zaura_shell.release(), connection); ReportShellUMA(UMALinuxWaylandShell::kZauraShell); + + // Usually WaylandOutputManager is instantiated first, so any ZAuraOutputs it + // created wouldn't have been initialized, since the zaura_shell didn't exist + // yet. So initialize them now. + if (connection->wayland_output_manager()) { + connection->wayland_output_manager()->InitializeAllZAuraOutputs(); + } } WaylandZAuraShell::WaylandZAuraShell(zaura_shell* aura_shell, -- cgit v1.2.1