diff options
author | Martin Stransky <stransky@redhat.com> | 2019-09-02 17:03:30 +0200 |
---|---|---|
committer | Martin Stransky <stransky@redhat.com> | 2019-09-02 17:03:30 +0200 |
commit | 20c032f2ed576eac3d30b4ac8851d13921e6cf77 (patch) | |
tree | 951702feca76e43fccba06e8cefc7f1230841744 /mozilla-1567434-2.patch | |
parent | Merge branch 'master' into f30 (diff) | |
download | librewolf-fedora-ff-20c032f2ed576eac3d30b4ac8851d13921e6cf77.tar.gz librewolf-fedora-ff-20c032f2ed576eac3d30b4ac8851d13921e6cf77.tar.bz2 librewolf-fedora-ff-20c032f2ed576eac3d30b4ac8851d13921e6cf77.zip |
Added upstream Wayland patches (mozilla-1548475, mozilla-1562827,
mozilla-1567434, mozilla-1573813, mozilla-1574036,
mozilla-1576268).
- Enable multiprocess compilation.
Diffstat (limited to 'mozilla-1567434-2.patch')
-rw-r--r-- | mozilla-1567434-2.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/mozilla-1567434-2.patch b/mozilla-1567434-2.patch new file mode 100644 index 0000000..966118a --- /dev/null +++ b/mozilla-1567434-2.patch @@ -0,0 +1,35 @@ +diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp +--- a/widget/gtk/nsWindow.cpp ++++ b/widget/gtk/nsWindow.cpp +@@ -1208,6 +1208,7 @@ + if (frame) { + menuPopupFrame = do_QueryFrame(frame); + } ++ + // The popup is not fully created yet (we're called from + // nsWindow::Create()) or we're toplevel popup without parent. + // In both cases just use parent which was passed to nsWindow::Create(). +@@ -1217,10 +1218,22 @@ + return GTK_WIDGET(parentWidget); + } + ++ LOG(("...[%p] is %s\n", (void*)this, ++ menuPopupFrame->IsContextMenu() ? "context menu" : "popup")); ++ + nsWindow* parentWindow = + static_cast<nsWindow*>(menuPopupFrame->GetParentMenuWidget()); + LOG(("...[%p] GetParentMenuWidget() = %p\n", (void*)this, parentWindow)); + ++ // If the popup is a regular menu but GetParentMenuWidget() returns ++ // nullptr which means it's connected non-menu parent ++ // (bookmark toolbar for instance). ++ // In this case use a parent given at nsWindow::Create(). ++ if (!parentWindow && !menuPopupFrame->IsContextMenu()) { ++ parentWindow = ++ get_window_for_gtk_widget(GTK_WIDGET(mToplevelParentWindow)); ++ } ++ + if (!parentWindow) { + LOG(("...[%p] using active/visible popups as a parent [%p]\n", + (void*)this, gVisibleWaylandPopupWindows->data)); + |