From da4c7e7ed675c3bf405668739c3012d140856109 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:42 +0200 Subject: Adding upstream version 126.0. Signed-off-by: Daniel Baumann --- widget/gtk/WindowSurfaceProvider.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'widget/gtk/WindowSurfaceProvider.h') diff --git a/widget/gtk/WindowSurfaceProvider.h b/widget/gtk/WindowSurfaceProvider.h index 6aaf50e2da..44a0d78ec6 100644 --- a/widget/gtk/WindowSurfaceProvider.h +++ b/widget/gtk/WindowSurfaceProvider.h @@ -81,7 +81,7 @@ class WindowSurfaceProvider final { */ mozilla::Mutex mMutex MOZ_UNANNOTATED; // WindowSurface needs to be re-created as underlying window was changed. - mozilla::Atomic mWindowSurfaceValid; + bool mWindowSurfaceValid; #ifdef MOZ_WAYLAND RefPtr mWidget; // WindowSurfaceProvider is owned by GtkCompositorWidget so we don't need @@ -91,7 +91,12 @@ class WindowSurfaceProvider final { #ifdef MOZ_X11 bool mIsShaped; int mXDepth; - Window mXWindow; + // Make mXWindow atomic to allow it read from different threads + // and make tsan happy. + // We don't care much about actual mXWindow value (it may be valid XWindow or + // nullptr) because we invalidate mXWindow at compositor/renderer thread + // before it's release in unmap handler. + Atomic mXWindow; Visual* mXVisual; #endif }; -- cgit v1.2.3