From 31c4cad2a2f60467949f702c23907d99a53d0e0e Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Fri, 12 Jul 2024 11:58:06 +0200
Subject: [PATCH] Added fix for mzbz#1907511

---
 firefox.spec          |  7 ++++++-
 mozilla-1907511.patch | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-1907511.patch

diff --git a/firefox.spec b/firefox.spec
index 12b6970..0e42468 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -189,7 +189,7 @@ ExcludeArch: i686
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        128.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -279,6 +279,7 @@ Patch422:        D210158.1715685536.diff
 Patch423:        D210159.1715685538.diff
 Patch424:        D210430.1715848796.diff
 Patch450:        mozilla-1898476-sync.patch
+Patch451:        mozilla-1907511.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -594,6 +595,7 @@ export LIBCLANG_RT=`pwd`/wasi-sdk-20/build/compiler-rt/lib/wasi/libclang_rt.buil
 %patch -P407 -p1 -b .1667096
 
 %patch -P450 -p1 -b mozilla-1898476-sync
+%patch -P451 -b1 -b mozilla-1907511
 
 # PGO patches
 %if %{build_with_pgo}
@@ -1226,6 +1228,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Jul 12 2024 Martin Stransky <stransky@redhat.com> - 128.0-2
+- Added fix for mzbz#1907511
+
 * Tue Jul 2 2024 Martin Stransky <stransky@redhat.com> - 128.0-1
 - Update to 128.0
 
diff --git a/mozilla-1907511.patch b/mozilla-1907511.patch
new file mode 100644
index 0000000..2601bd0
--- /dev/null
+++ b/mozilla-1907511.patch
@@ -0,0 +1,25 @@
+changeset:   751907:6bc8793df6c5
+tag:         tip
+parent:      751905:a52fa2f14d1d
+user:        stransky <stransky@redhat.com>
+date:        Fri Jul 12 11:26:34 2024 +0200
+files:       widget/gtk/GtkCompositorWidget.cpp
+description:
+Bug 1907511 [Linux/X11] Check mWindow at GtkCompositorWidget::LockSurface() r?emilio
+
+Differential Revision: https://phabricator.services.mozilla.com/D216380
+
+
+diff --git a/widget/gtk/GtkCompositorWidget.cpp b/widget/gtk/GtkCompositorWidget.cpp
+--- a/widget/gtk/GtkCompositorWidget.cpp
++++ b/widget/gtk/GtkCompositorWidget.cpp
+@@ -212,7 +212,7 @@ bool GtkCompositorWidget::IsPopup() {
+ #endif
+ 
+ UniquePtr<MozContainerSurfaceLock> GtkCompositorWidget::LockSurface() {
+-  return mWidget->LockSurface();
++  return mWidget ? mWidget->LockSurface() : nullptr;
+ }
+ 
+ }  // namespace widget
+