Rebase after pushes

comm-central/patches/9999999-port1760839-suite-100a1.patch

@@ -1,53 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1648118339 0
-Bug 9999999 - Port bug 1760839 to suite.
-Bug 1760839 - Use more automatic memory management in GTK code.
-
-diff --git a/suite/components/shell/nsGNOMEShellService.cpp b/suite/components/shell/nsGNOMEShellService.cpp
---- a/suite/components/shell/nsGNOMEShellService.cpp
-+++ b/suite/components/shell/nsGNOMEShellService.cpp
-@@ -19,16 +19,17 @@
- #include "nsIStringBundle.h"
- #include "nsIOutputStream.h"
- #include "nsIProcess.h"
- #include "nsServiceManagerUtils.h"
- #include "nsComponentManagerUtils.h"
- #include "nsIImageLoadingContent.h"
- #include "imgIRequest.h"
- #include "imgIContainer.h"
-+#include "mozilla/GRefPtr.h"
- #include "mozilla/Sprintf.h"
- #include "mozilla/dom/Element.h"
- #if defined(MOZ_WIDGET_GTK)
- #include "nsImageToPixbuf.h"
- #endif
- #include "nsXULAppAPI.h"
- #include "gfxPlatform.h"
- 
-@@ -282,24 +283,22 @@ nsGNOMEShellService::GetCanSetDesktopBac
- 
-   return NS_OK;
- }
- 
- static nsresult WriteImage(const nsCString &aPath, imgIContainer *aImage) {
- #if !defined(MOZ_WIDGET_GTK)
-   return NS_ERROR_NOT_AVAILABLE;
- #else
--  GdkPixbuf* pixbuf = nsImageToPixbuf::ImageToPixbuf(aImage);
-+  RefPtr<GdkPixbuf> pixbuf = nsImageToPixbuf::ImageToPixbuf(aImage);
-   if (!pixbuf) {
-     return NS_ERROR_NOT_AVAILABLE;
-   }
- 
-   gboolean res = gdk_pixbuf_save(pixbuf, aPath.get(), "png", nullptr, nullptr);
--
--  g_object_unref(pixbuf);
-   return res ? NS_OK : NS_ERROR_FAILURE;
- #endif
- }
- 
- NS_IMETHODIMP
- nsGNOMEShellService::SetDesktopBackground(dom::Element* aElement,
-                                           int32_t aPosition,
-                                           const nsACString& aImageName)

comm-central/patches/TOP-1611010-DOMEventListener-cc.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Ian Neal <iann_cvs@blueyonder.co.uk>
 # Date 1579738200 -3600
-# Parent  96b44ea5a7df63aad0f86c842073aac475a45b50
+# Parent  85ae41d14d153ec919a86b6deddac091696a070b
 Bug 1611010 - Port |Bug 1453345 part 5 - Remove pointless JS implementaions of QI to nsIDOMEventListener| and |Bug 1453487 part 2 - Remove useless implements="nsIDOMEventListener" from XBL bindings| to SeaMonkey. r=frg
 
 diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoomOverlay.js
@@ -523,14 +523,14 @@ diff --git a/suite/modules/WindowsPreviewPerTab.jsm b/suite/modules/WindowsPrevi
 -                                         Ci.nsIDOMEventListener]),
 +  QueryInterface: XPCOMUtils.generateQI([Ci.nsITaskbarPreviewController]),
  
+   _cachedWidth: 0,
+   _cachedHeight: 0,
+ 
    destroy: function () {
      this.tab.removeEventListener("TabAttrModified", this);
  
      // Break cycles, otherwise we end up leaking the window with everything
-     // attached to it.
-     delete this.win;
-     delete this.preview;
-@@ -311,17 +310,17 @@ PreviewController.prototype = {
+@@ -314,17 +313,17 @@ PreviewController.prototype = {
    onActivate: function () {
      this.win.tabbrowser.selectedTab = this.tab;
  
@@ -549,7 +549,7 @@ diff --git a/suite/modules/WindowsPreviewPerTab.jsm b/suite/modules/WindowsPrevi
      }
    }
  };
-@@ -474,17 +473,17 @@ TabWindow.prototype = {
+@@ -479,17 +478,17 @@ TabWindow.prototype = {
      // on it the sorting order of our local array.  To do so we must walk
      // the local array backwards, otherwise we would send move requests in the
      // wrong order. See bug 522610 for details.

comm-central/patches/TOP-1614671-port1456035-4-and-5-61a1-cc.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Ian Neal <iann_cvs@blueyonder.co.uk>
 # Date 1581435120 -3600
-# Parent  00a0aee4349656ab489a2873cb5ff99eb32d98db
+# Parent  dc81b8c484a5a89786a40a199541eecac688ccf2
 Bug 1614671 - Port |Bug 1456035 Part 4 - Convert callers of XPCOMUtils.generateQI to ChromeUtils.generateQI|, |Bug 1456035 Part 5 - Convert manual QueryInterface to ChromeUtils.generateQI| and |Bug 1460092 - Add ESLint rule to enforce use of ChromeUtils.generateQI| to SeaMonkey. r=frg
 
 diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoomOverlay.js
@@ -2037,14 +2037,14 @@ diff --git a/suite/modules/WindowsPreviewPerTab.jsm b/suite/modules/WindowsPrevi
 -  QueryInterface: XPCOMUtils.generateQI([Ci.nsITaskbarPreviewController]),
 +  QueryInterface: ChromeUtils.generateQI([Ci.nsITaskbarPreviewController]),
  
+   _cachedWidth: 0,
+   _cachedHeight: 0,
+ 
    destroy: function () {
      this.tab.removeEventListener("TabAttrModified", this);
  
      // Break cycles, otherwise we end up leaking the window with everything
-     // attached to it.
-     delete this.win;
-     delete this.preview;
-@@ -826,19 +826,19 @@ var AeroPeek = {
+@@ -831,19 +831,19 @@ var AeroPeek = {
            if (tab.getAttribute("image") == newValue) {
              win.onLinkIconAvailable(tab.linkedBrowser, newValue);
            }

comm-central/patches/series

@@ -1,4 +1,3 @@
-9999999-port1760839-suite-100a1.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch