chore: Updated to ff 138.0 and recalculated patches, b=(no-bug), c=tabs, media

src/browser/components/BrowserContentHandler-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index 7747d90981aea9437bf2d9cf46ec17be0b9ad64c..656d640da0efeb59a4037bb450e0cb1f69dda0ba 100644
+index 5911b276fdc9889d3cb61bac3d302ec5239e4a90..a405f8a0204e98fa9de08f1cd7b6761f0fc6198e 100644
 --- a/browser/components/BrowserContentHandler.sys.mjs
 +++ b/browser/components/BrowserContentHandler.sys.mjs
 @@ -1270,6 +1270,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {

src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-index af22f766a052372a68faca139161cccbf0d768f0..199591ca0609e8902e84a87baf50acc29f84ee3a 100644
+index b88b0166fb99bc3d44a2e05798650b8ad6ab9a46..2e66c8294f0ef4f91ae160bd55b7417b55e9f5b2 100644
 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
 +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
 @@ -240,8 +240,8 @@ export var ToolbarContextMenu = {

src/browser/components/customizableui/content/panelUI-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index 010d0813557efd6d5a3a84ea589989f6e9ff195a..e26cc1be1f56919e6ec5f2432854b284837671ac 100644
+index ec52437dba30633a374299a46c856e1df05dec0e..48617e32d56c3b3f525557ddeac6297555c48c04 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
 @@ -515,8 +515,7 @@ const PanelUI = {
@@ -12,7 +12,7 @@ index 010d0813557efd6d5a3a84ea589989f6e9ff195a..e26cc1be1f56919e6ec5f2432854b284
          .appendChild(tempPanel);
  
        let multiView = document.createXULElement("panelmultiview");
-@@ -960,7 +959,7 @@ const PanelUI = {
+@@ -957,7 +956,7 @@ const PanelUI = {
          el.removeAttribute("data-lazy-l10n-id");
        });
  

src/browser/components/places/PlacesUIUtils-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
-index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658514db39f 100644
+index 1f5e163bae58f3f1cac750ca32846cc8a80bd2ca..16034842b4ca5295aa3c9237db55035ecc4016d2 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
-@@ -58,6 +58,7 @@ class BookmarkState {
+@@ -59,6 +59,7 @@ class BookmarkState {
      info,
      tags = "",
      keyword = "",
@@ -10,7 +10,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658
      isFolder = false,
      children = [],
      autosave = false,
-@@ -82,12 +83,18 @@ class BookmarkState {
+@@ -83,12 +84,18 @@ class BookmarkState {
        keyword,
        parentGuid: info.parentGuid,
        index,
@@ -29,7 +29,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658
    /**
     * Save edited title for the bookmark
     *
-@@ -181,6 +188,14 @@ class BookmarkState {
+@@ -182,6 +189,14 @@ class BookmarkState {
        "BookmarkState::createBookmark"
      );
      this._guid = results?.[0];
@@ -44,7 +44,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658
      return this._guid;
    }
  
-@@ -214,6 +229,14 @@ class BookmarkState {
+@@ -215,6 +230,14 @@ class BookmarkState {
        "BookmarkState::save::createFolder"
      );
      this._guid = results[0];
@@ -59,7 +59,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658
      return this._guid;
    }
  
-@@ -300,11 +323,97 @@ class BookmarkState {
+@@ -301,11 +324,97 @@ class BookmarkState {
        await lazy.PlacesTransactions.batch(transactions, "BookmarkState::save");
      }
  
@@ -157,7 +157,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658
    /**
     * Append transactions to update tags by given information.
     *
-@@ -902,8 +1011,15 @@ export var PlacesUIUtils = {
+@@ -903,8 +1012,15 @@ export var PlacesUIUtils = {
      aNode,
      aWhere,
      aWindow,

src/browser/components/preferences/main-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index 8f6f78419a0876ebe6d0967a88ef03e464dbbd23..9339085014b797033c4ee1ed2e40f2506d1e9797 100644
+index aa339be9ba94ed776fa25f2d72f9e6b25dc86cd3..4c6c725942b3d6f2a42938d444ac7645526623cc 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -218,7 +218,7 @@ function getBundleForLocales(newLocales) {
+@@ -389,7 +389,7 @@ function getBundleForLocales(newLocales) {
      ])
    );
    return new Localization(

src/browser/components/preferences/preferences-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index 6386773b287ca6d06a0abe928850c5bb465828ed..b3459a2abcac5f21a5b24189ec1dc88e24626687 100644
+index e4746e3408e68273126e6d2baf5afcf80721674b..e478aaf6bfefa6acd9062aeb3e4709ca0d5d779c 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
 @@ -118,6 +118,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {

src/browser/components/search/SearchOneOffs-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/search/SearchOneOffs.sys.mjs b/browser/components/search/SearchOneOffs.sys.mjs
-index 4810eca0825f9a6f07f242e804de2edb7bd697d8..fd4e7661c93be528c2766e27fe22403d3d495292 100644
+index c1f8fd1225cfc47c2e171361aa6069d3cbaf3afb..b32a2cf621022a500a2efc7777b4379347dcf353 100644
 --- a/browser/components/search/SearchOneOffs.sys.mjs
 +++ b/browser/components/search/SearchOneOffs.sys.mjs
-@@ -443,7 +443,7 @@ export class SearchOneOffs {
+@@ -444,7 +444,7 @@ export class SearchOneOffs {
      // For the search-bar, always show the one-off buttons where there is an
      // option to add an engine.
      let addEngineNeeded = isSearchBar && addEngines.length;

src/browser/components/sessionstore/SessionStore-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047669c8c94 100644
+index 5633e5032f5d50c70512187d27e045b579978927..7604adcd38308c38c7c62d16aa29c860a7726649 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
-@@ -3186,7 +3186,7 @@ var SessionStoreInternal = {
+@@ -3202,7 +3202,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -11,7 +11,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047
        return;
      }
  
-@@ -3895,6 +3895,8 @@ var SessionStoreInternal = {
+@@ -3911,6 +3911,8 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -20,7 +20,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -5399,14 +5401,15 @@ var SessionStoreInternal = {
+@@ -5416,14 +5418,15 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -38,7 +38,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047
          continue;
        }
        let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab));
-@@ -5425,7 +5428,7 @@ var SessionStoreInternal = {
+@@ -5442,7 +5445,7 @@ var SessionStoreInternal = {
      // We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
@@ -47,7 +47,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047
        selectedIndex = 1;
        winData.title = tabbrowser.tabs[0].label;
      }
-@@ -5582,6 +5585,7 @@ var SessionStoreInternal = {
+@@ -5599,6 +5602,7 @@ var SessionStoreInternal = {
          winData.tabs,
          winData.groups ?? []
        );
@@ -55,7 +55,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6130,8 +6134,23 @@ var SessionStoreInternal = {
+@@ -6148,8 +6152,23 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26ada76767d 100644
+index 6dece2b9d0462d90a28e75350ce983d87816ef73..86f0002b6fab433d62d460e8f8babac91ffa9185 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -415,11 +415,58 @@
@@ -63,7 +63,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        }
        return i;
      }
-@@ -549,6 +596,7 @@
+@@ -571,6 +618,7 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -71,7 +71,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -814,11 +862,13 @@
+@@ -836,11 +884,13 @@
        }
  
        this.showTab(aTab);
@@ -88,7 +88,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          this.moveTabTo(aTab, {
            tabIndex: this.pinnedTabCount,
            forceUngrouped: true,
-@@ -835,12 +885,15 @@
+@@ -857,12 +907,15 @@
        }
  
        if (this.tabContainer.verticalMode) {
@@ -105,7 +105,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          });
        } else {
          this.moveTabTo(aTab, {
-@@ -1024,6 +1077,8 @@
+@@ -1046,6 +1099,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -114,7 +114,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        if (
          aIconURL &&
          !aLoadingPrincipal &&
-@@ -1034,6 +1089,9 @@
+@@ -1056,6 +1111,9 @@
          );
          return;
        }
@@ -124,7 +124,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1283,6 +1341,7 @@
+@@ -1305,6 +1363,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -132,7 +132,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1435,6 +1494,9 @@
+@@ -1457,6 +1516,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -142,7 +142,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -1758,7 +1820,8 @@
+@@ -1780,7 +1842,8 @@
      }
  
      _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -152,7 +152,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          return false;
        }
  
-@@ -1866,7 +1929,7 @@
+@@ -1888,7 +1951,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -161,7 +161,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2130,6 +2193,7 @@
+@@ -2152,6 +2215,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -169,7 +169,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2203,8 +2267,7 @@
+@@ -2225,8 +2289,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -179,7 +179,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          b.setAttribute("transparent", "true");
        }
  
-@@ -2369,7 +2432,7 @@
+@@ -2391,7 +2454,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -188,7 +188,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2428,8 +2491,8 @@
+@@ -2450,8 +2513,8 @@
        // If we transitioned from one browser to two browsers, we need to set
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
@@ -199,7 +199,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2657,6 +2720,7 @@
+@@ -2679,6 +2742,7 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -207,7 +207,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -2667,6 +2731,12 @@
+@@ -2689,6 +2753,12 @@
          );
        }
  
@@ -220,7 +220,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2730,6 +2800,16 @@
+@@ -2752,6 +2822,16 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -237,15 +237,15 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          if (insertTab) {
            if (typeof index == "number") {
              elementIndex = this.#tabIndexToElementIndex(index);
-@@ -2756,6 +2836,7 @@
-           initialBrowsingContextGroupId,
+@@ -2779,6 +2859,7 @@
            openWindowInfo,
            skipLoad,
+           triggeringRemoteType,
 +          _forZenEmptyTab,
          }));
  
          if (focusUrlBar) {
-@@ -2875,6 +2956,9 @@
+@@ -2898,6 +2979,9 @@
          }
        }
  
@@ -255,7 +255,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -2922,12 +3006,15 @@
+@@ -2945,12 +3029,15 @@
       * @param {string} [label=]
       * @returns {MozTabbrowserTabGroup}
       */
@@ -272,7 +272,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        return group;
      }
  
-@@ -2970,6 +3057,7 @@
+@@ -2993,6 +3080,7 @@
          insertBefore = null,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -280,7 +280,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        } = {}
      ) {
        if (!tabs?.length) {
-@@ -2988,7 +3076,12 @@
+@@ -3011,7 +3099,12 @@
          id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
        }
        let group = this._createTabGroup(id, color, false, label);
@@ -294,15 +294,15 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          group,
          insertBefore?.group ?? insertBefore
        );
-@@ -3318,6 +3411,7 @@
-         initialBrowsingContextGroupId,
+@@ -3342,6 +3435,7 @@
          openWindowInfo,
          skipLoad,
+         triggeringRemoteType,
 +        _forZenEmptyTab
        }
      ) {
-       // If we don't have a preferred remote type, and we have a remote
-@@ -3381,6 +3475,7 @@
+       // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
+@@ -3411,6 +3505,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -310,7 +310,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          });
        }
  
-@@ -3559,6 +3654,27 @@
+@@ -3589,6 +3684,27 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -338,7 +338,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3607,8 +3723,28 @@
+@@ -3637,8 +3753,28 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -369,7 +369,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
              tabToSelect = tab;
            }
          }
-@@ -3631,7 +3767,8 @@
+@@ -3661,7 +3797,8 @@
              // needs calling:
              shouldUpdateForPinnedTabs = true;
            }
@@ -379,7 +379,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -3645,7 +3782,10 @@
+@@ -3675,7 +3812,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -391,7 +391,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -3696,6 +3836,10 @@
+@@ -3726,6 +3866,10 @@
          this.selectedTab = tabToSelect;
          this.removeTab(leftoverTab);
        }
@@ -402,7 +402,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -3882,7 +4026,7 @@
+@@ -3912,7 +4056,7 @@
        // Ensure we have an index if one was not provided.
        if (typeof index != "number") {
          // Move the new tab after another tab if needed, to the end otherwise.
@@ -411,7 +411,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3928,18 +4072,18 @@
+@@ -3958,18 +4102,18 @@
  
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -434,7 +434,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          if (this.isTab(itemAfter) && itemAfter.group == tabGroup) {
            // Place at the front of, or between tabs in, the same tab group
            this.tabContainer.insertBefore(tab, itemAfter);
-@@ -4260,6 +4404,9 @@
+@@ -4290,6 +4434,9 @@
          return;
        }
  
@@ -444,7 +444,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        this.removeTabs(selectedTabs, { telemetrySource });
      }
  
-@@ -4512,6 +4659,7 @@
+@@ -4542,6 +4689,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -452,7 +452,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -4596,6 +4744,7 @@
+@@ -4626,6 +4774,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -460,7 +460,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        } catch (e) {
          console.error(e);
        }
-@@ -4620,6 +4769,7 @@
+@@ -4650,6 +4799,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -468,7 +468,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        if (UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.finish("browser.tabs.opening", window);
        }
-@@ -4633,6 +4783,12 @@
+@@ -4663,6 +4813,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -481,7 +481,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4647,7 +4803,9 @@
+@@ -4677,7 +4833,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -492,7 +492,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4810,7 +4968,7 @@
+@@ -4840,7 +4998,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -501,7 +501,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4834,6 +4992,7 @@
+@@ -4864,6 +5022,7 @@
  
          newTab = true;
        }
@@ -509,7 +509,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4873,9 +5032,7 @@
+@@ -4903,9 +5062,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -520,7 +520,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        } else {
          TabBarVisibility.update();
        }
-@@ -5004,6 +5161,8 @@
+@@ -5034,6 +5191,8 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -529,7 +529,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        if (!this._windowIsClosing) {
          if (wasPinned) {
            this.tabContainer._positionPinnedTabs();
-@@ -5129,8 +5288,8 @@
+@@ -5159,8 +5318,8 @@
        return closedCount;
      }
  
@@ -540,7 +540,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        if (unloadBlocked) {
          return;
        }
-@@ -5230,13 +5389,13 @@
+@@ -5260,13 +5419,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -556,7 +556,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        );
  
        let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5252,7 +5411,7 @@
+@@ -5282,7 +5441,7 @@
        }
  
        if (tab) {
@@ -565,7 +565,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5273,7 +5432,7 @@
+@@ -5303,7 +5462,7 @@
          });
        }
  
@@ -574,7 +574,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
      }
  
      _blurTab(aTab) {
-@@ -5674,10 +5833,10 @@
+@@ -5704,10 +5863,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -587,7 +587,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5971,7 +6130,7 @@
+@@ -6001,7 +6160,7 @@
  
        // Don't allow mixing pinned and unpinned tabs.
        if (this.isTab(element) && element.pinned) {
@@ -596,7 +596,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -5998,9 +6157,16 @@
+@@ -6028,9 +6187,16 @@
          element,
          () => {
            let neighbor = this.tabs[tabIndex];
@@ -614,7 +614,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6069,7 +6235,9 @@
+@@ -6099,7 +6265,9 @@
            targetElement = targetElement.group;
          }
        }
@@ -625,7 +625,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        // Don't allow mixing pinned and unpinned tabs.
        if (element.pinned && !targetElement?.pinned) {
          targetElement = this.tabs[this.pinnedTabCount - 1];
-@@ -6079,7 +6247,13 @@
+@@ -6109,7 +6277,13 @@
          moveBefore = true;
        }
  
@@ -639,7 +639,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          if (element.pinned && this.tabContainer.verticalMode) {
            return this.tabContainer.verticalPinnedTabsContainer;
          }
-@@ -6139,7 +6313,7 @@
+@@ -6169,7 +6343,7 @@
        if (!this.isTab(aTab)) {
          throw new Error("Can only move a tab into a tab group");
        }
@@ -648,7 +648,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6233,6 +6407,10 @@
+@@ -6263,6 +6437,10 @@
  
        moveActionCallback();
  
@@ -659,7 +659,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7050,7 +7228,7 @@
+@@ -7080,7 +7258,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -668,7 +668,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7951,6 +8129,7 @@
+@@ -7981,6 +8159,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -676,7 +676,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -8924,7 +9103,7 @@ var TabContextMenu = {
+@@ -8954,7 +9133,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -685,7 +685,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -9193,6 +9372,7 @@ var TabContextMenu = {
+@@ -9223,6 +9402,7 @@ var TabContextMenu = {
          telemetrySource: gBrowser.TabMetrics.METRIC_SOURCE.TAB_STRIP,
        });
      } else {

src/browser/components/urlbar/UrlbarInput-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862f1d17b8d 100644
+index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..100f96cb58499dbae490b3772effef0f79aec75b 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
-@@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
+@@ -68,6 +68,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
    false
  );
  
@@ -16,7 +16,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  const SEARCH_BUTTON_CLASS = "urlbar-search-button";
  
-@@ -348,7 +355,11 @@ export class UrlbarInput {
+@@ -349,7 +356,11 @@ export class UrlbarInput {
      // See _on_select().  HTMLInputElement.select() dispatches a "select"
      // event but does not set the primary selection.
      this._suppressPrimaryAdjustment = true;
@@ -28,7 +28,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
      this._suppressPrimaryAdjustment = false;
    }
  
-@@ -424,6 +435,10 @@ export class UrlbarInput {
+@@ -425,6 +436,10 @@ export class UrlbarInput {
      hideSearchTerms = false,
      isSameDocument = false
    ) {
@@ -39,7 +39,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
      // We only need to update the searchModeUI on tab switch conditionally
      // as we only persist searchMode with ScotchBonnet enabled.
      if (
-@@ -697,8 +712,11 @@ export class UrlbarInput {
+@@ -698,8 +713,11 @@ export class UrlbarInput {
          return;
        }
      }
@@ -52,7 +52,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
    }
  
    /**
-@@ -1092,7 +1110,11 @@ export class UrlbarInput {
+@@ -1093,7 +1111,11 @@ export class UrlbarInput {
      }
  
      if (!this.#providesSearchMode(result)) {
@@ -65,7 +65,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
      }
  
      this.controller.recordSelectedResult(event, result);
-@@ -2124,6 +2146,10 @@ export class UrlbarInput {
+@@ -2125,6 +2147,10 @@ export class UrlbarInput {
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -76,7 +76,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2146,6 +2172,11 @@ export class UrlbarInput {
+@@ -2147,6 +2173,11 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -88,7 +88,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2165,6 +2196,19 @@ export class UrlbarInput {
+@@ -2166,6 +2197,19 @@ export class UrlbarInput {
        return;
      }
  
@@ -108,7 +108,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2997,7 +3041,7 @@ export class UrlbarInput {
+@@ -2998,7 +3042,7 @@ export class UrlbarInput {
     */
    _trimValue(val) {
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -117,7 +117,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3367,6 +3411,10 @@ export class UrlbarInput {
+@@ -3368,6 +3412,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -128,7 +128,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3374,6 +3422,9 @@ export class UrlbarInput {
+@@ -3375,6 +3423,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -138,7 +138,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
      return where;
    }
  
-@@ -3625,7 +3676,7 @@ export class UrlbarInput {
+@@ -3626,7 +3677,7 @@ export class UrlbarInput {
      pasteAndGo.setAttribute("anonid", "paste-and-go");
      pasteAndGo.addEventListener("command", () => {
        this._suppressStartQuery = true;
@@ -147,7 +147,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
        this.select();
        this.window.goDoCommand("cmd_paste");
        this.setResultForCurrentValue(null);
-@@ -3638,7 +3689,6 @@ export class UrlbarInput {
+@@ -3639,7 +3690,6 @@ export class UrlbarInput {
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -155,7 +155,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4048,6 +4098,11 @@ export class UrlbarInput {
+@@ -4053,6 +4103,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -167,7 +167,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -4119,7 +4174,7 @@ export class UrlbarInput {
+@@ -4124,7 +4179,7 @@ export class UrlbarInput {
        }
      }
  
@@ -176,7 +176,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4159,9 +4214,12 @@ export class UrlbarInput {
+@@ -4164,9 +4219,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -190,7 +190,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862
  
          if (
            event.target != this.inputField &&
-@@ -4171,8 +4229,8 @@ export class UrlbarInput {
+@@ -4176,8 +4234,8 @@ export class UrlbarInput {
            break;
          }
  

src/browser/components/urlbar/UrlbarView-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index 0e6724f590490354cc4d4bde5176556f7e4b4a7c..bffc52488443d62de46abe5cbdac4504831c4a09 100644
+index d5382623595de8daed8cd13ea2eb2de329a4bd92..8e160e0bb5a1cd626753feba2008a24e3bbd84cd 100644
 --- a/browser/components/urlbar/UrlbarView.sys.mjs
 +++ b/browser/components/urlbar/UrlbarView.sys.mjs
-@@ -610,7 +610,7 @@ export class UrlbarView {
+@@ -609,7 +609,7 @@ export class UrlbarView {
        !this.input.value ||
        this.input.getAttribute("pageproxystate") == "valid"
      ) {