From 99644f391c050294be2e6e3ca3d512d8f02042d2 Mon Sep 17 00:00:00 2001
From: stransky <stransky@redhat.com>
Date: Tue, 26 Jul 2022 14:56:47 +0000
Subject: [PATCH] Bug 1777664 [Wayland] Don't pause compositor when nsWindow is
 hidden r=emilio

We should not pause compositor as compositing is driven by refresh driver and compositor pause leads to browser freeze.

Differential Revision: https://phabricator.services.mozilla.com/D152689
---
 widget/gtk/nsWindow.cpp | 39 ++-------------------------------------
 widget/gtk/nsWindow.h   |  2 --
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
index cafde243f600..8708cc082435 100644
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -1102,12 +1102,6 @@ void nsWindow::RemovePopupFromHierarchyList() {
   mWaylandPopupNext = mWaylandPopupPrev = nullptr;
 }
 
-void nsWindow::HideWaylandWindow() {
-  LOG("nsWindow::HideWaylandWindow: [%p]\n", this);
-  PauseCompositorHiddenWindow();
-  gtk_widget_hide(mShell);
-}
-
 // Gtk refuses to map popup window with x < 0 && y < 0 relative coordinates
 // see https://gitlab.gnome.org/GNOME/gtk/-/issues/4071
 // as a workaround just fool around and place the popup temporary to 0,0.
@@ -1209,7 +1203,7 @@ void nsWindow::HideWaylandPopupWindow(bool aTemporaryHide,
 
   // Hide only visible popups or popups closed pernamently.
   if (visible) {
-    HideWaylandWindow();
+    gtk_widget_hide(mShell);
 
     // If there's pending Move-To-Rect callback and we hide the popup
     // the callback won't be called any more.
@@ -1238,7 +1232,7 @@ void nsWindow::HideWaylandToplevelWindow() {
       popup = prev;
     }
   }
-  HideWaylandWindow();
+  gtk_widget_hide(mShell);
 }
 
 void nsWindow::WaylandPopupRemoveClosedPopups() {
@@ -5322,7 +5316,6 @@ void nsWindow::EnableRenderingToWindow() {
 void nsWindow::DisableRenderingToWindow() {
   LOG("nsWindow::DisableRenderingToWindow()");
 
-  PauseCompositorHiddenWindow();
   WaylandStopVsync();
   if (mCompositorWidgetDelegate) {
     mCompositorWidgetDelegate->DisableRendering();
@@ -6129,34 +6122,6 @@ void nsWindow::ResumeCompositorHiddenWindow() {
   }
 }
 
-// Because wl_egl_window is destroyed on moz_container_unmap(),
-// the current compositor cannot use it anymore. To avoid crash,
-// pause the compositor and destroy EGLSurface & resume the compositor
-// and re-create EGLSurface on next expose event.
-void nsWindow::PauseCompositorHiddenWindow() {
-  LOG("nsWindow::PauseCompositorHiddenWindow");
-
-  if (mCompositorState != COMPOSITOR_ENABLED) {
-    LOG("  quit early, compositor is disabled");
-    return;
-  }
-
-  mCompositorState = COMPOSITOR_PAUSED_MISSING_WINDOW;
-
-  // Without remote widget / renderer we can't pause compositor.
-  // So delete LayerManager to avoid EGLSurface access.
-  CompositorBridgeChild* remoteRenderer = GetRemoteRenderer();
-  if (!remoteRenderer || !mCompositorWidgetDelegate) {
-    LOG("  deleted layer manager");
-    DestroyLayerManager();
-    return;
-  }
-
-  // XXX slow sync IPC
-  LOG("  paused compositor");
-  remoteRenderer->SendPause();
-}
-
 static int WindowResumeCompositor(void* data) {
   nsWindow* window = static_cast<nsWindow*>(data);
   window->ResumeCompositor();
diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
index a457e5b2ebc8..348e97d598ce 100644
--- a/widget/gtk/nsWindow.h
+++ b/widget/gtk/nsWindow.h
@@ -486,7 +486,6 @@ class nsWindow final : public nsBaseWidget {
   void EnableRenderingToWindow();
   void DisableRenderingToWindow();
   void ResumeCompositorHiddenWindow();
-  void PauseCompositorHiddenWindow();
   void WaylandStartVsync();
   void WaylandStopVsync();
   void DestroyChildWindows();
@@ -790,7 +789,6 @@ class nsWindow final : public nsBaseWidget {
   bool IsWidgetOverflowWindow();
   void RemovePopupFromHierarchyList();
   void ShowWaylandWindow();
-  void HideWaylandWindow();
   void HideWaylandPopupWindow(bool aTemporaryHidden, bool aRemoveFromPopupList);
   void HideWaylandToplevelWindow();
   void WaylandPopupHideTooltips();