From db2e77cf9fe645684d98fdd0561eaef3abc801ea Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Mon, 9 May 2022 14:17:09 +0200
Subject: Added fix for mozbz#1767916

---
 D145541.diff | 21 +++++++++++++++++++++
 firefox.spec |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 D145541.diff

diff --git a/D145541.diff b/D145541.diff
new file mode 100644
index 0000000..7ca3a2e
--- /dev/null
+++ b/D145541.diff
@@ -0,0 +1,21 @@
+diff --git a/widget/gtk/MozContainerWayland.cpp b/widget/gtk/MozContainerWayland.cpp
+--- a/widget/gtk/MozContainerWayland.cpp
++++ b/widget/gtk/MozContainerWayland.cpp
+@@ -527,10 +527,16 @@
+       return;
+     }
+ 
+     LOGWAYLAND("%s [%p] scale %d\n", __FUNCTION__,
+                (void*)moz_container_get_nsWindow(container), scale);
++    // There is a chance that the attached wl_buffer has not yet been doubled
++    // on the main thread when scale factor changed to 2. This leads to
++    // crash with the following message:
++    // Buffer size (AxB) must be an integer multiple of the buffer_scale (2)
++    // Removing the possibly wrong wl_buffer to prevent that crash:
++    wl_surface_attach(wl_container->surface, nullptr, 0, 0);
+     wl_surface_set_buffer_scale(wl_container->surface, scale);
+     wl_container->buffer_scale = scale;
+   }
+ }
+ 
+
diff --git a/firefox.spec b/firefox.spec
index 9f172c1..13b52e2 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -163,7 +163,7 @@ ExcludeArch: aarch64
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        100.0
-Release:        3%{?pre_tag}%{?dist}
+Release:        4%{?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
@@ -242,6 +242,7 @@ Patch407:        mozilla-1667096.patch
 Patch408:        mozilla-1663844.patch
 Patch415:        mozilla-1670333.patch
 Patch416:        D145094.diff
+Patch417:        D145541.diff
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -482,6 +483,7 @@ This package contains results of tests executed during build.
 %patch408 -p1 -b .1663844
 %patch415 -p1 -b .1670333
 %patch416 -p1 -b .D145094
+%patch417 -p1 -b .D145541
 
 # PGO patches
 %if %{build_with_pgo}
@@ -1048,6 +1050,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon May 9 2022 Martin Stransky <stransky@redhat.com>- 100.0-4
+- Added fix for mozbz#1767916.
+
 * Thu May 5 2022 Martin Stransky <stransky@redhat.com>- 100.0-3
 - Removed Fedora user agent patch (rhbz#2081791).
 
-- 
cgit