summaryrefslogtreecommitdiff
path: root/queue-crash.patch
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2018-03-06 15:00:42 +0100
committerMartin Stransky <stransky@redhat.com>2018-03-06 15:00:42 +0100
commitbee8e7456aef10b3298647cb20f73f7b5803c852 (patch)
treecbfc930f57395b21dcbc6b1cfe3fa562e165ee97 /queue-crash.patch
parentFix prefs because of rpm (diff)
parentFix crash when e10s is disabled and default wl_queue is processed. (diff)
downloadlibrewolf-fedora-ff-bee8e7456aef10b3298647cb20f73f7b5803c852.tar.gz
librewolf-fedora-ff-bee8e7456aef10b3298647cb20f73f7b5803c852.tar.bz2
librewolf-fedora-ff-bee8e7456aef10b3298647cb20f73f7b5803c852.zip
Merged with firefox-59
Diffstat (limited to 'queue-crash.patch')
-rw-r--r--queue-crash.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/queue-crash.patch b/queue-crash.patch
new file mode 100644
index 0000000..962fce9
--- /dev/null
+++ b/queue-crash.patch
@@ -0,0 +1,26 @@
+diff --git a/widget/gtk/WindowSurfaceWayland.cpp b/widget/gtk/WindowSurfaceWayland.cpp
+--- a/widget/gtk/WindowSurfaceWayland.cpp
++++ b/widget/gtk/WindowSurfaceWayland.cpp
+@@ -268,17 +268,21 @@ nsWaylandDisplay::GetShm()
+
+ if (!mShm) {
+ // wl_shm is not provided by Gtk so we need to query wayland directly
+ // See weston/simple-shm.c and create_display() for reference.
+ wl_registry* registry = wl_display_get_registry(mDisplay);
+ wl_registry_add_listener(registry, &registry_listener, this);
+
+ wl_proxy_set_queue((struct wl_proxy *)registry, mEventQueue);
+- wl_display_roundtrip_queue(mDisplay, mEventQueue);
++ if (mEventQueue) {
++ wl_display_roundtrip_queue(mDisplay, mEventQueue);
++ } else {
++ wl_display_roundtrip(mDisplay);
++ }
+
+ MOZ_RELEASE_ASSERT(mShm, "Wayland registry query failed!");
+ }
+
+ return(mShm);
+ }
+
+ bool
bgstack15