1 files changed, 7 insertions, 2 deletions
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<bool> mWindowSurfaceValid;
+  bool mWindowSurfaceValid;
 #ifdef MOZ_WAYLAND
   RefPtr<nsWindow> 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<Window, Relaxed> mXWindow;
   Visual* mXVisual;
 #endif
 };