summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug1636072
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-05-27 20:03:54 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-05-27 20:03:54 +0000
commit388d9e9592ab476d252b62b9246ce37ba57a5a2f (patch)
treee60017bcdb617dc67b9a226cfd6f50ad58ce662f /www/firefox/files/patch-bug1636072
parentgecko: add missing Wayland dependency with libglvnd (diff)
www/firefox: switch to rc2
- Backport some Wayland fixes Changes: https://hg.mozilla.org/releases/mozilla-release/pushloghtml?startdate=2020-05-26&enddate=2020-05-28
Notes
Notes: svn path=/head/; revision=536713
Diffstat (limited to 'www/firefox/files/patch-bug1636072')
-rw-r--r--www/firefox/files/patch-bug163607233
1 files changed, 33 insertions, 0 deletions
diff --git a/www/firefox/files/patch-bug1636072 b/www/firefox/files/patch-bug1636072
new file mode 100644
index 000000000000..777df034b253
--- /dev/null
+++ b/www/firefox/files/patch-bug1636072
@@ -0,0 +1,33 @@
+commit edbe69232a5b
+Author: Martin Stransky <stransky@redhat.com>
+Date: Tue May 12 09:20:25 2020 +0000
+
+ Bug 1636072 [Wayland] Don't crash when GetWlBuffer() fails, r=jhorak
+
+ Differential Revision: https://phabricator.services.mozilla.com/D74663
+---
+ widget/gtk/WindowSurfaceWayland.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.cpp
+index 372158c9f0f33..56f5d3d530853 100644
+--- widget/gtk/WindowSurfaceWayland.cpp
++++ widget/gtk/WindowSurfaceWayland.cpp
+@@ -390,10 +390,13 @@ void WindowBackBuffer::Attach(wl_surface* aSurface) {
+ (void*)GetWlBuffer(),
+ GetWlBuffer() ? wl_proxy_get_id((struct wl_proxy*)GetWlBuffer()) : -1));
+
+- wl_surface_attach(aSurface, GetWlBuffer(), 0, 0);
+- wl_surface_commit(aSurface);
+- wl_display_flush(WaylandDisplayGetWLDisplay());
+- SetAttached();
++ wl_buffer* buffer = GetWlBuffer();
++ if (buffer) {
++ wl_surface_attach(aSurface, buffer, 0, 0);
++ wl_surface_commit(aSurface);
++ wl_display_flush(WaylandDisplayGetWLDisplay());
++ SetAttached();
++ }
+ }
+
+ void WindowBackBufferShm::Detach(wl_buffer* aBuffer) {