Update to firefox 113.0

gluon.json

@@ -5,7 +5,7 @@
   "binaryName": "pulse-browser",
   "version": {
     "product": "firefox",
-    "version": "112.0"
+    "version": "113.0.1"
   },
   "buildOptions": {
     "generateBranding": true
@@ -99,4 +99,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.pulsebrowser.app"
-}
+}

src/browser/app/profile/firefox-js.patch

@@ -1,10 +1,10 @@
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 81f4d49068c285049d49db6c8fc5c0fbe042ff6b..39ef13fb66567c31ebf932d7a6f528fa1d635069 100644
+index 56c8022ec4bbeda70e09c3b8780afcbf21ba0579..4d637ea6263799f9574ac23f0c8900949540dfec 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -2804,3 +2804,5 @@ pref("cookiebanners.ui.desktop.cfrVariant", 0);
-   pref("browser.swipe.navigation-icon-min-radius", 12);
-   pref("browser.swipe.navigation-icon-max-radius", 20);
+@@ -2837,3 +2837,5 @@ pref("cookiebanners.ui.desktop.cfrVariant", 0);
+ #ifdef MOZ_ARTIFACT_BUILDS
+   pref("telemetry.fog.artifact_build", true);
  #endif
 +
 +#include pulse-browser.js

src/browser/app/profile/pulse-browser.js

@@ -92,3 +92,10 @@ pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS");
 
 // This pref needs to be here to not break context menus (GH#169)
 pref("extensions.pocket.enabled", false);
+
+// Reenable accessability. Should have a low enough performance impact with the
+// changes in 113
+//  0: auto-detect
+//  1: force disable
+// -1: force enable
+pref('accessibility.force_disabled', 0);

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

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
-index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e492783860a67c28 100644
+index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..738502d7c0dd9336a48270249818861dcdff9c1a 100644
 --- a/browser/base/content/browser-sidebar.js
 +++ b/browser/base/content/browser-sidebar.js
 @@ -11,6 +11,9 @@ var SidebarUI = {
@@ -74,17 +74,17 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
      ]));
    },
 
-@@ -63,6 +98,10 @@ var SidebarUI = {
+@@ -62,6 +97,10 @@ var SidebarUI = {
+   },
    POSITION_START_PREF: "sidebar.position_start",
    DEFAULT_SIDEBAR_ID: "viewBookmarksSidebar",
-
++  
 +  SIDEBAR_KEEP_TABS_ACTIVE_PREF: "pulse.sidebar.keeptabsactive.enabled",
 +  SIDEBAR_TABS_PREF: "pulse.sidebar.enabled",
 +  SIDEBAR_EXTENSIONS_PREF: "pulse.sidebar.extensions.enabled",
-+
+ 
    // lastOpenedId is set in show() but unlike currentID it's not cleared out on hide
    // and isn't persisted across windows
-   lastOpenedId: null,
 @@ -83,6 +122,15 @@ var SidebarUI = {
    _switcherArrow: null,
    _inited: false,
@@ -101,7 +101,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
    /**
     * @type {MutationObserver | null}
     */
-@@ -112,20 +160,80 @@ var SidebarUI = {
+@@ -112,20 +160,79 @@ var SidebarUI = {
        this.toggleSwitcherPanel();
      });
 
@@ -176,14 +176,13 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
      if (!enumerator.hasMoreElements()) {
        let xulStore = Services.xulStore;
 -      xulStore.persist(this._box, "sidebarcommand");
-+
 +      if (!this._keepTabsActivePref) {
 +        xulStore.persist(this._box, "sidebarcommand");
 +      }
 
        if (this._box.hasAttribute("positionend")) {
          xulStore.persist(this._box, "positionend");
-@@ -157,7 +265,7 @@ var SidebarUI = {
+@@ -157,7 +264,7 @@ var SidebarUI = {
    /**
     * The handler for Services.obs.addObserver.
     **/
@@ -192,7 +191,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
      switch (topic) {
        case "intl:app-locales-changed": {
          if (this.isOpen) {
-@@ -168,6 +276,54 @@ var SidebarUI = {
+@@ -168,6 +275,54 @@ var SidebarUI = {
            this.showInitially(this.lastOpenedId);
            break;
          }
@@ -247,16 +246,16 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
        }
      }
    },
-@@ -284,17 +440,32 @@ var SidebarUI = {
+@@ -284,17 +439,32 @@ var SidebarUI = {
      // First reset all ordinals to match DOM ordering.
      let browser = document.getElementById("browser");
      [...browser.children].forEach((node, i) => {
 +      // Do not change ordinal on vertical tabs
 +      if (node.id == "TabsToolbar" || node.id == "verticaltabs-splitter") {
 +        return;
 +      }
-+
-       node.style.MozBoxOrdinalGroup = i + 1;
++     
+       node.style.order = i + 1;
      });
 
      if (!this._positionStart) {
@@ -271,21 +270,21 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
 +
 +      // sidebar-container and appcontent
        let appcontent = document.getElementById("appcontent");
--      let boxOrdinal = this._box.style.MozBoxOrdinalGroup;
--      this._box.style.MozBoxOrdinalGroup = appcontent.style.MozBoxOrdinalGroup;
-+      let boxOrdinal = this._sidebarTabs.style.MozBoxOrdinalGroup;
-+      this._sidebarTabs.style.MozBoxOrdinalGroup =
-+        appcontent.style.MozBoxOrdinalGroup;
-       appcontent.style.MozBoxOrdinalGroup = boxOrdinal;
+-      let boxOrdinal = this._box.style.order;
+-      this._box.style.order = appcontent.style.order;
++      let boxOrdinal = this._sidebarTabs.style.order;
++      this._sidebarTabs.style.order = appcontent.style.order;
+       appcontent.style.order = boxOrdinal;
 +
 +      // splitter and sidebar-box
-+      const splitterBoxOrdinal = this._splitter.style.MozBoxOrdinalGroup;
-+      this._splitter.style.MozBoxOrdinalGroup = this._box.style.MozBoxOrdinalGroup;
-+      this._box.style.MozBoxOrdinalGroup = splitterBoxOrdinal;
++      const splitterBoxOrdinal = this._splitter.style.order;
++      this._splitter.style.order = this._box.style.order;
++      this._box.style.order = splitterBoxOrdinal;
++ 
        // Indicate we've switched ordering to the box
        this._box.setAttribute("positionend", true);
      } else {
-@@ -483,6 +654,10 @@ var SidebarUI = {
+@@ -483,6 +653,10 @@ var SidebarUI = {
    },
 
    _loadSidebarExtension(commandID) {
@@ -296,23 +295,23 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
      let sidebar = this.sidebars.get(commandID);
      let { extensionId } = sidebar;
      if (extensionId) {
-@@ -521,6 +696,7 @@ var SidebarUI = {
+@@ -521,6 +695,7 @@ var SidebarUI = {
        }
 
        this._fireFocusedEvent();
 +      this.loadedSidebars.push(commandID);
        return true;
      });
    },
-@@ -544,6 +720,7 @@ var SidebarUI = {
+@@ -544,6 +719,7 @@ var SidebarUI = {
      }
      return this._show(commandID).then(() => {
        this._loadSidebarExtension(commandID);
 +      this.loadedSidebars.push(commandID);
        return true;
      });
    },
-@@ -557,6 +734,38 @@ var SidebarUI = {
+@@ -557,6 +733,38 @@ var SidebarUI = {
     */
    _show(commandID) {
      return new Promise(resolve => {
@@ -347,11 +346,11 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
 +          browser.setAttribute("hidden", "true");
 +        }
 +      }
-+
++      
        this.selectMenuItem(commandID);
 
        this._box.hidden = this._splitter.hidden = false;
-@@ -574,7 +783,13 @@ var SidebarUI = {
+@@ -574,7 +782,13 @@ var SidebarUI = {
        this.observeTitleChanges(sourceL10nEl);
        this.browser.setAttribute("src", url); // kick off async load
 
@@ -366,29 +365,25 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
          this.browser.addEventListener(
            "load",
            event => {
-@@ -618,12 +833,19 @@ var SidebarUI = {
+@@ -618,11 +832,14 @@ var SidebarUI = {
      // create a new content viewer because the old one doesn't get destroyed
      // until about:blank has loaded (which does not happen as long as the
      // element is hidden).
 -    this.browser.setAttribute("src", "about:blank");
 -    this.browser.docShell.createAboutBlankContentViewer(null, null);
+-
 +    if (!this._keepTabsActivePref) {
 +      this.browser.setAttribute("src", "about:blank");
 +      this.browser.docShell.createAboutBlankContentViewer(null, null);
 +    }
-
++    
      this._box.removeAttribute("checked");
      this._box.hidden = this._splitter.hidden = true;
 +    this._sidebarIcons.removeAttribute("checked");
 
-+    // Note: This was was commented out but had no description for its removed
-+    // reason. I am bringing it back unless there is any other justification - tricky
-+    //
-+    // Removed in: :mute: Remove Test Logs
      let selBrowser = gBrowser.selectedBrowser;
      selBrowser.focus();
-     if (triggerNode) {
-@@ -636,10 +858,27 @@ var SidebarUI = {
+@@ -636,10 +853,28 @@ var SidebarUI = {
     * none if the argument is an empty string.
     */
    selectMenuItem(commandID) {
@@ -405,6 +400,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
 -      let triggerbutton =
 +      let dropdownTriggerButton =
          triggerButtonId && document.getElementById(triggerButtonId);
++
 +      const sidebarTriggerButton = document.getElementById(
 +        `sidebar-background-${id}`
 +      );
@@ -417,7 +413,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
        if (id == commandID) {
          menu.setAttribute("checked", "true");
          if (triggerbutton) {
-@@ -655,6 +894,107 @@ var SidebarUI = {
+@@ -655,6 +890,107 @@ var SidebarUI = {
        }
      }
    },

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

@@ -157,11 +157,11 @@ var VerticalTabs = {
         'class',
         'chromeclass-extrachrome verticaltabs-splitter'
       )
-      separator.setAttribute('resizebefore', 'none')
-      separator.setAttribute('resizeafter', 'sibling')
+      separator.setAttribute('resizebefore', 'sibling')
+      separator.setAttribute('resizeafter', 'none')
 
       const tabs = this.tabsToolbar
-      if (tabs) tabs.parentElement?.insertBefore(separator, tabs)
+      if (tabs) insertAfter(tabs, separator)
     }
   },
 

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

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/contentTheme.js b/browser/base/content/contentTheme.js
-index d634a17c2633dc2ead40082c71622fe1b7a491a2..73b2dedad1ccd3db43aca773f2e8bdcaa2737bda 100644
+index a2298986bae01a16c5306223a963119d37d2f8e4..64783d98f228c7ee373dfc1492d62ed84143b88a 100644
 --- a/browser/base/content/contentTheme.js
 +++ b/browser/base/content/contentTheme.js
-@@ -135,6 +135,119 @@
+@@ -135,6 +135,105 @@
          lwtProperty: "sidebar_highlight_text",
        },
      ],
@@ -60,13 +60,6 @@ index d634a17c2633dc2ead40082c71622fe1b7a491a2..73b2dedad1ccd3db43aca773f2e8bdca
 +        lwtProperty: "button_primary_color",
 +      }
 +    ],
-+    [
-+      "--in-content-link-color",
-+      {
-+        lwtProperty: "button_primary_color",
-+      }
-+    ],
-+ 
 +
 +    [
 +      "--in-content-primary-button-text-color-hover",
@@ -86,13 +79,6 @@ index d634a17c2633dc2ead40082c71622fe1b7a491a2..73b2dedad1ccd3db43aca773f2e8bdca
 +        lwtProperty: "button_primary_color",
 +      }
 +    ],
-+    [
-+      "--in-content-link-color-hover",
-+      {
-+        lwtProperty: "button_primary_color",
-+      }
-+    ],
-+ 
 +
 +    [
 +      "--in-content-page-background",

src/browser/locales/en-US/browser/browser-ftl.patch

@@ -1,12 +1,14 @@
 diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl
-index e86de659cda8d8f8bbc4df8346f97697e75848f5..91262ca49165a753dfdd644fd6ef2fd278f7a2d2 100644
+index 710e5248557993012830e41d025b530c7bf33ade..8f58c6b9a2e6d726a30f49b40839b2c70e8d7195 100644
 --- a/browser/locales/en-US/browser/browser.ftl
 +++ b/browser/locales/en-US/browser/browser.ftl
-@@ -963,3 +963,7 @@ firefox-relay-offer-how-we-integrate = By continuing, you’ll be able to genera
- #  $sitename (String): name of the site where user enters their Relay mask
+@@ -982,6 +982,9 @@ firefox-relay-offer-how-we-integrate = By continuing, you’ll be able to genera
  #  $useremail (String): user email that will receive messages
  firefox-relay-offer-what-relay-does = We’ll forward all emails from <strong>{ $sitename }</strong> to <strong>{ $useremail }</strong>.
-+
+ 
 +sidebar-context-delete = 
 +    .label = Delete
 +
+ ## Popup Notification
+
+ popup-notification-xpinstall-prompt-learn-more = Learn more about installing add-ons safely

src/browser/themes/ThemeVariableMap-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs
-index f2fd99193ddd0c24b7ad3ec953216973b162aaed..1810528d3b1d7b5cd2fb3f45548c8377a2f5f165 100644
+index f2fd99193ddd0c24b7ad3ec953216973b162aaed..6d03f796569080667910276c631fb6731547c9d7 100644
 --- a/browser/themes/ThemeVariableMap.sys.mjs
 +++ b/browser/themes/ThemeVariableMap.sys.mjs
 @@ -126,7 +126,9 @@ export const ThemeVariableMap = [
@@ -13,7 +13,26 @@ index f2fd99193ddd0c24b7ad3ec953216973b162aaed..1810528d3b1d7b5cd2fb3f45548c8377
        processColor(rgbaChannels, element) {
          if (!rgbaChannels) {
            element.removeAttribute("lwt-sidebar");
-@@ -187,4 +189,10 @@ export const ThemeContentPropertyList = [
+@@ -176,6 +178,18 @@ export const ThemeVariableMap = [
+       },
+     },
+   ],
++  [
++    "--in-content-link-color",
++    {
++      lwtProperty: "icon_color",
++    },
++  ],
++  [
++    "--in-content-link-color-hover",
++    {
++      lwtProperty: "icon_color",
++    },
++  ],
+ ];
+
+ export const ThemeContentPropertyList = [
+@@ -187,4 +201,10 @@ export const ThemeContentPropertyList = [
    "sidebar_highlight_text",
    "sidebar_text",
    "zap_gradient",