Added fix for mozbz#1804973 Wayland/EGL window crash

This commit is contained in:
Martin Stransky 2023-01-16 11:43:35 +01:00
parent 2871a2e567
commit 1913d82157
2 changed files with 20 additions and 0 deletions

18
D164651.diff Normal file
View File

@ -0,0 +1,18 @@
diff --git a/widget/gtk/MozContainerWayland.cpp b/widget/gtk/MozContainerWayland.cpp
--- a/widget/gtk/MozContainerWayland.cpp
+++ b/widget/gtk/MozContainerWayland.cpp
@@ -702,10 +702,13 @@
bool moz_container_wayland_egl_window_needs_size_update(MozContainer* container,
nsIntSize aSize,
int aScale) {
MozContainerWayland* wl_container = &container->wl_container;
+ if (!wl_container->eglwindow) {
+ return false;
+ }
if (wl_container->buffer_scale != aScale) {
return true;
}
nsIntSize recentSize;
wl_egl_window_get_attached_size(wl_container->eglwindow, &recentSize.width,

View File

@ -249,6 +249,7 @@ Patch402: mozilla-1196777.patch
Patch407: mozilla-1667096.patch Patch407: mozilla-1667096.patch
Patch408: mozilla-1663844.patch Patch408: mozilla-1663844.patch
Patch415: mozilla-1670333.patch Patch415: mozilla-1670333.patch
Patch416: D164651.diff
# PGO/LTO patches # PGO/LTO patches
Patch600: pgo.patch Patch600: pgo.patch
@ -523,6 +524,7 @@ This package contains results of tests executed during build.
%patch407 -p1 -b .1667096 %patch407 -p1 -b .1667096
%patch408 -p1 -b .1663844 %patch408 -p1 -b .1663844
%patch415 -p1 -b .1670333 %patch415 -p1 -b .1670333
%patch416 -p1 -b .D164651
# PGO patches # PGO patches
%if %{build_with_pgo} %if %{build_with_pgo}