Bug 1882021 [Linux/X11] Clean up XWindow from GtkCompositorWidget and…

… disable rendering if nsWindow is unmapped r=emilio Differential Revision: https://phabricator.services.mozilla.com/D203104
dothq · Feb 29, 2024 · 506151a · 506151a
1 parent 2960b1b
commit 506151a
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
@@ -615,8 +615,6 @@ void nsWindow::Destroy() {
 
   DestroyLayerManager();
 
-  mSurfaceProvider.CleanupResources();
-
   g_signal_handlers_disconnect_by_data(gtk_settings_get_default(), this);
 
   if (mIMContext) {
@@ -4123,6 +4121,16 @@ void nsWindow::OnUnmap() {
       mSourceDragContext = nullptr;
     }
   }
+
+  // We don't have valid XWindow any more,
+  // so clear stored ones at GtkCompositorWidget() for OMTC rendering
+  // and mSurfaceProvider for legacy rendering.
+  if (GdkIsX11Display()) {
+    mSurfaceProvider.CleanupResources();
+    if (mCompositorWidgetDelegate) {
+      mCompositorWidgetDelegate->DisableRendering();
+    }
+  }
 }
 
 void nsWindow::OnSizeAllocate(GtkAllocation* aAllocation) {