feat: Replace zen's tab unloader with firefox's one. Also added more tests, b=(no-bug), c=common, tabs, tests, glance

Author: mr-cheffy

l10n

@@ -97,10 +97,6 @@ pref('zen.keyboard.shortcuts.disable-mainkeyset-clear', false); // for debugging
 
 pref('zen.themes.updated-value-observer', false);
 
-pref('zen.tab-unloader.enabled', true);
-pref('zen.tab-unloader.timeout-minutes', 40);
-pref('zen.tab-unloader.excluded-urls', "example.com,example.org");
-
 pref('zen.pinned-tab-manager.debug', false);
 pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
 pref('zen.pinned-tab-manager.close-shortcut-behavior', 'reset-unload-switch');

src/browser/app/profile/features.inc

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..7fe04b426a8dd3c8dbb71065da047f8f48b8e84c 100644
+index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..5059293ebfa29d646455b7a3505bd6eae408ba64 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -10,19 +10,18 @@ index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..7fe04b426a8dd3c8dbb71065da047f8f
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -2340,6 +2341,11 @@ var XULBrowserWindow = {
+@@ -2340,6 +2341,10 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
 
 +    gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser);
 +    gZenWorkspaces.onLocationChange(gBrowser.selectedBrowser);
-+    gZenTabUnloader.onLocationChange(gBrowser.selectedBrowser);
 +    gZenPinnedTabManager.onLocationChange(gBrowser.selectedBrowser);
 +
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
 
      if (!gMultiProcessBrowser) {
-@@ -4816,7 +4822,7 @@ function switchToTabHavingURI(
+@@ -4816,7 +4821,7 @@ function switchToTabHavingURI(
        ignoreQueryString || replaceQueryString,
        ignoreFragmentWhenComparing
      );
@@ -31,7 +30,7 @@ index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..7fe04b426a8dd3c8dbb71065da047f8f
      for (let i = 0; i < browsers.length; i++) {
        let browser = browsers[i];
        let browserCompare = cleanURL(
-@@ -4859,7 +4865,7 @@ function switchToTabHavingURI(
+@@ -4859,7 +4864,7 @@ function switchToTabHavingURI(
          }
 
          if (!doAdopt) {

src/browser/base/content/browser-js.patch

@@ -34,7 +34,6 @@
 <script src="chrome://browser/content/zen-components/ZenThemesCommon.mjs"></script>
 <script src="chrome://browser/content/zen-components/ZenThemesImporter.mjs"></script>
 <script src="chrome://browser/content/zen-components/ZenCompactMode.mjs"></script>
-<script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs"></script>
 <script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs"></script>
 <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs"></script>
 <script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs"></script>

src/browser/base/content/zen-assets.inc.xhtml

@@ -50,7 +50,6 @@
 
         content/browser/zen-components/ZenKeyboardShortcuts.mjs                 (../../zen/kbs/ZenKeyboardShortcuts.mjs)
 
-        content/browser/zen-components/ZenTabUnloader.mjs                       (../../zen/tabs/ZenTabUnloader.mjs)
         content/browser/zen-components/ZenPinnedTabsStorage.mjs                 (../../zen/tabs/ZenPinnedTabsStorage.mjs)
         content/browser/zen-components/ZenPinnedTabManager.mjs                  (../../zen/tabs/ZenPinnedTabManager.mjs)
 *       content/browser/zen-styles/zen-tabs.css                                 (../../zen/tabs/zen-tabs.css)

src/browser/base/content/zen-assets.jar.inc.mn

@@ -43,10 +43,6 @@
 
   <command id="cmd_zenCopyCurrentURL" />
   <command id="cmd_zenCopyCurrentURLMarkdown" />
-
-  <command id="cmd_zenUnloadTab" />
-  <command id="cmd_zenPreventUnloadTab" />
-  <command id="cmd_zenIgnoreUnloadTab" />
 </commandset>
 
 <keyset id="zenKeyset"></keyset>

src/browser/base/content/zen-keysets.inc.xhtml

@@ -37,18 +37,7 @@
 
       <checkbox id="zenTabsUnloadActivate"
             data-l10n-id="zen-tabs-unloader-enabled"
-            preference="zen.tab-unloader.enabled"/>
-
-
-      <label><html:h2 data-l10n-id="zen-tabs-unloader-unload-delay"/></label>
-      <hbox id="zenTabsUnloadDelayContainer">
-            <description class="description-deemphasized" data-l10n-id="zen-tabs-unloader-unload-delay-description" />
-            <html:input id="zenTabsUnloadDelay"
-                  type="number"
-                  min="1"
-                  max="1000"
-                  preference="zen.tab-unloader.timeout-minutes"/>
-      </hbox>
+            preference="browser.tabs.unloadOnLowMemory"/>
 </groupbox>
 
 <hbox id="zenPinnedTabsManagerCategory"

src/browser/components/preferences/zenTabsManagement.inc.xhtml

@@ -0,0 +1,13 @@
+diff --git a/browser/components/tabbrowser/TabUnloader.sys.mjs b/browser/components/tabbrowser/TabUnloader.sys.mjs
+index 44846cc902fd3fc17d12be38ac9abccb47a12f23..c715c7cf47486066b3fd6f92bf78bc8a720759bc 100644
+--- a/browser/components/tabbrowser/TabUnloader.sys.mjs
++++ b/browser/components/tabbrowser/TabUnloader.sys.mjs
+@@ -52,7 +52,7 @@ let CRITERIA_WEIGHT = 1;
+  */
+ let DefaultTabUnloaderMethods = {
+   isNonDiscardable(tab, weight) {
+-    if (tab.undiscardable || tab.selected) {
++    if (tab.undiscardable || tab.selected || tab.zenModeActive) {
+       return weight;
+     }
+ 

src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index d5aa64842a35c6697263c63fd3a0571b64b01344..bcae8a44593d7b3e5efdd999b4c2f5bcac221632 100644
+index d5aa64842a35c6697263c63fd3a0571b64b01344..6943dc7f1d3d95ab1da315cbdbda0b032cf200f1 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -413,11 +413,41 @@
@@ -491,17 +491,6 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..bcae8a44593d7b3e5efdd999b4c2f5bc
        if (!this._windowIsClosing) {
          if (wasPinned) {
            this.tabContainer._positionPinnedTabs();
-@@ -5141,8 +5266,8 @@
-       return closedCount;
-     }
- 
--    async explicitUnloadTabs(tabs) {
--      let unloadBlocked = await this.runBeforeUnloadForTabs(tabs);
-+    async explicitUnloadTabs(tabs, skipPermitUnload = false) {
-+      let unloadBlocked = skipPermitUnload ? false : await this.runBeforeUnloadForTabs(tabs);
-       if (unloadBlocked) {
-         return;
-       }
 @@ -5230,6 +5355,7 @@
        }
 

src/browser/components/tabbrowser/content/tabbrowser-js.patch

@@ -1051,8 +1051,7 @@ menuitem[id='placesContext_new:separator'] {
   --menu-image: url('close-all.svg');
 }
 
-#context_zenUnloadTab,
-#context_zenUnloadWebPanel,
+#context_unloadTab,
 #context_zenTabActions {
   --menu-image: url('close-all.svg');
 }