summaryrefslogtreecommitdiff
path: root/mozilla-1431052.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 /mozilla-1431052.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 'mozilla-1431052.patch')
-rw-r--r--mozilla-1431052.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/mozilla-1431052.patch b/mozilla-1431052.patch
new file mode 100644
index 0000000..59376bd
--- /dev/null
+++ b/mozilla-1431052.patch
@@ -0,0 +1,21 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -6948,11 +6948,15 @@ nsWindow::GetWaylandDisplay()
+ GdkDisplay* gdkDisplay = gdk_display_get_default();
+ return mIsX11Display ? nullptr :
+ sGdkWaylandDisplayGetWlDisplay(gdkDisplay);
+ }
+
+ wl_surface*
+ nsWindow::GetWaylandSurface()
+ {
+- return moz_container_get_wl_surface(MOZ_CONTAINER(mContainer));
++ if (mContainer)
++ return moz_container_get_wl_surface(MOZ_CONTAINER(mContainer));
++
++ NS_WARNING("nsWindow::GetWaylandSurfaces(): We don't have any mContainer for drawing!");
++ return nullptr;
+ }
+ #endif
+
bgstack15