From 9dfa7a1527028bdebc6160a63a62098a6935aabc Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 1 Jun 2021 10:15:57 +0200
Subject: Updated to Firefox 89.0

---
 mozilla-1705048.patch | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'mozilla-1705048.patch')

diff --git a/mozilla-1705048.patch b/mozilla-1705048.patch
index 58497a4..b45faa2 100644
--- a/mozilla-1705048.patch
+++ b/mozilla-1705048.patch
@@ -1,6 +1,6 @@
-diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/nsWindow.cpp
---- firefox-88.0/widget/gtk/nsWindow.cpp.1705048	2021-05-04 15:43:16.039586526 +0200
-+++ firefox-88.0/widget/gtk/nsWindow.cpp	2021-05-04 15:47:26.358614462 +0200
+diff -up firefox-89.0/widget/gtk/nsWindow.cpp.1705048 firefox-89.0/widget/gtk/nsWindow.cpp
+--- firefox-89.0/widget/gtk/nsWindow.cpp.1705048	2021-06-01 10:12:40.671376199 +0200
++++ firefox-89.0/widget/gtk/nsWindow.cpp	2021-06-01 10:13:45.134701718 +0200
 @@ -553,6 +553,7 @@ nsWindow::nsWindow() {
    mTitlebarBackdropState = false;
  
@@ -9,16 +9,16 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/ns
    mIsPIPWindow = false;
    mAlwaysOnTop = false;
  
-@@ -3713,7 +3714,7 @@ void nsWindow::OnButtonPressEvent(GdkEve
+@@ -3724,7 +3725,7 @@ void nsWindow::OnButtonPressEvent(GdkEve
  
    LayoutDeviceIntPoint refPoint =
        GdkEventCoordsToDevicePixels(aEvent->x, aEvent->y);
 -  if (mDraggableRegion.Contains(refPoint.x, refPoint.y) &&
 +  if ((mIsWaylandPanelWindow || mDraggableRegion.Contains(refPoint.x, refPoint.y)) &&
        domButton == MouseButton::ePrimary &&
-       eventStatus != nsEventStatus_eConsumeNoDefault) {
+       eventStatus.mContentStatus != nsEventStatus_eConsumeNoDefault) {
      mWindowShouldStartDragging = true;
-@@ -4614,8 +4615,9 @@ nsresult nsWindow::Create(nsIWidget* aPa
+@@ -4636,8 +4637,9 @@ nsresult nsWindow::Create(nsIWidget* aPa
        // as a workaround.
        mWindowType = eWindowType_toplevel;
      } else if (mWindowType == eWindowType_popup && !aNativeParent && !aParent) {
@@ -30,7 +30,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/ns
        mWindowType = eWindowType_toplevel;
      }
    }
-@@ -4642,8 +4644,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
+@@ -4664,8 +4666,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
        // popup window position.
        GtkWindowType type = GTK_WINDOW_TOPLEVEL;
        if (mWindowType == eWindowType_popup) {
@@ -43,7 +43,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/ns
        }
        mShell = gtk_window_new(type);
  
-@@ -4890,6 +4894,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
+@@ -4912,6 +4916,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
        }
  #endif
  
@@ -54,10 +54,10 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/ns
        if (mWindowType == eWindowType_popup) {
          // gdk does not automatically set the cursor for "temporary"
          // windows, which are what gtk uses for popups.
-diff -up firefox-88.0/widget/gtk/nsWindow.h.1705048 firefox-88.0/widget/gtk/nsWindow.h
---- firefox-88.0/widget/gtk/nsWindow.h.1705048	2021-05-04 15:43:16.041586502 +0200
-+++ firefox-88.0/widget/gtk/nsWindow.h	2021-05-04 15:45:01.703331956 +0200
-@@ -591,6 +591,10 @@ class nsWindow final : public nsBaseWidg
+diff -up firefox-89.0/widget/gtk/nsWindow.h.1705048 firefox-89.0/widget/gtk/nsWindow.h
+--- firefox-89.0/widget/gtk/nsWindow.h.1705048	2021-06-01 10:12:40.671376199 +0200
++++ firefox-89.0/widget/gtk/nsWindow.h	2021-06-01 10:12:40.673376240 +0200
+@@ -590,6 +590,10 @@ class nsWindow final : public nsBaseWidg
    LayoutDeviceIntRegion mDraggableRegion;
    // It's PictureInPicture window.
    bool mIsPIPWindow;
-- 
cgit