From 9956bb1eafb6bf3ea0f56a3376530d423b1a1dd8 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 11 Jan 2022 19:47:58 +0100
Subject: Update to Firefox 96

---
 D133885.diff | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 D133885.diff

(limited to 'D133885.diff')

diff --git a/D133885.diff b/D133885.diff
new file mode 100644
index 0000000..246fc2a
--- /dev/null
+++ b/D133885.diff
@@ -0,0 +1,33 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -2868,7 +2868,7 @@
+   LOGW("nsWindow::RequestFocusWaylandWindow(%p) gFocusWindow %p",
+        (void*)aWindow, gFocusWindow);
+ 
+-  if (!gFocusWindow) {
++  if (!gFocusWindow || gFocusWindow->IsDestroyed()) {
+     LOGW("  missing gFocusWindow, quit.");
+   }
+ 
+@@ -2883,13 +2883,16 @@
+   uint32_t focusSerial;
+   KeymapWrapper::GetFocusInfo(&focusSurface, &focusSerial);
+   if (!focusSurface) {
+-    LOGW("  We're missing focused window, quit.");
++    LOGW("  We're missing KeymapWrapper focused window, quit.");
+     return;
+   }
+ 
+   GdkWindow* gdkWindow = gtk_widget_get_window(gFocusWindow->mShell);
+-  wl_surface* surface =
+-      gdkWindow ? gdk_wayland_window_get_wl_surface(gdkWindow) : nullptr;
++  if (!gdkWindow) {
++    LOGW("  gFocusWindow is not mapped, quit.");
++    return;
++  }
++  wl_surface* surface = gdk_wayland_window_get_wl_surface(gdkWindow);
+   if (focusSurface != surface) {
+     LOGW("  focused surface %p and gFocusWindow surface %p don't match, quit.",
+          focusSurface, surface);
+
-- 
cgit