Merge pull request #11359 from Rmys/master

firefox-109.0
2023-01-17 12:24:43 +03:00
parent fcaff6ade4 63d4dc0a2e
commit a892f9df16
2 changed files with 26 additions and 1 deletions
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: stransky <stransky@redhat.com>
+Date: Thu, 15 Dec 2022 08:09:22 +0000
+Subject: [PATCH] Bug 1804973 [Wayland] Check size for valid EGLWindows only
+ r=emilio
+
+Differential Revision: https://phabricator.services.mozilla.com/D164651
+---
+ widget/gtk/MozContainerWayland.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/widget/gtk/MozContainerWayland.cpp b/widget/gtk/MozContainerWayland.cpp
+index 954c650af533..2a4a492077c3 100644
+--- a/widget/gtk/MozContainerWayland.cpp
+++ b/widget/gtk/MozContainerWayland.cpp
+@@ -704,6 +704,9 @@ 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;
+   }
@@ -74,7 +74,7 @@
            <Dependency>jack-audio-connection-kit-devel</Dependency>
        </BuildDependencies>
        <Patches>
-<!--             <Patch level="1">cbindgen-0.24.0.diff</Patch> -->
+            <Patch level="1">0002-Bug-1804973-Wayland-Check-size-for-valid-EGLWindows-.patch</Patch>
 <!--             <Patch level="1">zstandard-0.18.0.diff</Patch> -->
        </Patches>
    </Source>