Merge pull request #1009 from jonathanmendez/main-merge_2026060900

Enterprise main merge 2026060900

Author: jonathanmendez

.taskcluster.yml

@@ -258,12 +258,11 @@ tasks:
                           - -cx
                           - $let:
                                 extraArgs:
-                                    $if: 'tasks_for == "cron"'
-                                    then: '${cron.quoted_args}'
-                                    else:
-                                        $if: 'repository.project in ["autoland", "try"]'
-                                        then: '--no-verify'
-                                        else: ''
+                                    $switch:
+                                        'tasks_for == "cron"': '${cron.quoted_args}'
+                                        'repository.project == "autoland"': '--no-verify'
+                                        'repository.project == "try"': '--no-verify --allow-parameter-override'
+                                        $default: ''
                             in:
                                 $if: 'tasks_for == "action"'
                                 then: >
@@ -580,7 +579,11 @@ tasks:
                                       - bash
                                       - -cx
                                       - $let:
-                                            extraArgs: {$if: 'tasks_for == "cron"', then: '${cron.quoted_args}', else: ''}
+                                            extraArgs:
+                                                $switch:
+                                                    'tasks_for == "cron"': '${cron.quoted_args}'
+                                                    'repoType == "dev"': '--allow-parameter-override'
+                                                    $default: ''
                                         in:
                                             $if: 'eventType == "action"'
                                             then: >

Cargo.lock

@@ -17,6 +17,7 @@
 #include "nsIWebProgress.h"
 #include "prenv.h"
 #include "nsIDocShellTreeItem.h"
+#include "nsPIDOMWindowInlines.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ScrollContainerFrame.h"

accessible/base/Logging.cpp

@@ -15,6 +15,7 @@
 #include "mozilla/Components.h"
 #include "nsGlobalWindowOuter.h"
 #include "nsIStringBundle.h"
+#include "nsPIDOMWindowInlines.h"
 
 using namespace mozilla::a11y;
 

accessible/generic/ApplicationAccessible.cpp

@@ -107,6 +107,10 @@ https_first_disabled = true
 support-files = ["file_invalid_href.html"]
 
 ["browser_favicon_pdf.js"]
+# Bug 2015285: PDF.js now declares an explicit chrome:// favicon, so no
+# /favicon.ico request is made to the PDF's origin and this test no longer
+# observes one. Disabled until the test is updated for the new behavior.
+skip-if = ["true"]
 support-files = ["blank.pdf"]
 
 ["browser_missing_favicon.js"]

browser/base/content/test/favicons/browser.toml

@@ -891,9 +891,10 @@ BrowserGlue.prototype = {
         // This usually happens after the test harness is done collecting
         // test errors, thus we can't easily add a failure to it. The only
         // noticeable solution we have is crashing.
+        // See bug 2034905 for filename / fileName shenanigans.
         Cc["@mozilla.org/xpcom/debug;1"]
           .getService(Ci.nsIDebug2)
-          .abort(ex.filename, ex.lineNumber);
+          .abort(ex.filename || ex.fileName, ex.lineNumber);
       }
     }
 

browser/components/BrowserGlue.sys.mjs

@@ -1711,10 +1711,15 @@ class ProtonScreen extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureCom
   renderSecondarySection(content) {
     const background = this.getEffectiveBackground(content);
     const heroImageUrl = this.getEffectiveHeroImageUrl(content);
+    // pinnable_sites exposes its background through a custom property so the
+    // stylesheet can swap the wide-layout image for a narrow gradient without
+    // overriding an inline `background` shorthand.
+    const tiles = Array.isArray(content.tiles) ? content.tiles : [content.tiles];
+    const isPinnableSites = tiles.some(tile => tile?.type === "pinnable_sites");
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: `section-secondary ${content.hide_secondary_section ? "with-secondary-section-hidden" : ""}`,
       style: background ? {
-        background,
+        [isPinnableSites ? "--pinnable-sites-bkg" : "background"]: background,
         "--mr-secondary-background-position-y": content.split_narrow_bkg_position
       } : {}
     }, content.dismiss_button && content.reverse_split ? this.renderDismissButton() : null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_MSLocalized__WEBPACK_IMPORTED_MODULE_1__.Localized, {

browser/components/aboutwelcome/content/aboutwelcome.bundle.js

@@ -1209,8 +1209,90 @@ html {
   padding-block: 40px 0;
 }
 .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .action-buttons .primary {
-  min-width: 96px;
-  padding-block: 8px;
+  min-width: 71px;
+  padding-block: 7px;
+}
+.onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .tile-title {
+  font-size: 18px;
+}
+.onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary {
+  background: var(--pinnable-sites-bkg);
+}
+.onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary .hero-text h1 {
+  font-size: 26px;
+}
+.onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary .hero-text h2 {
+  margin-block-end: 370px;
+}
+@media only screen and (width <= 800px) {
+  .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .main-content-inner {
+    align-items: stretch;
+    margin-block-start: -30px;
+  }
+  .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .action-buttons {
+    text-align: start;
+    justify-content: flex-start;
+  }
+  .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .pinnable-sites-list {
+    max-width: none;
+  }
+  .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .pinnable-sites-list .pinnable-sites-pin-button {
+    min-width: 62px;
+  }
+  .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .tile-title {
+    font-size: 13px;
+  }
+  .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary {
+    background: linear-gradient(0deg, light-dark(rgb(252, 245, 240), #210340) 0%, light-dark(rgb(250, 236, 241), #210340) 57%, light-dark(rgb(245, 212, 245), #210340) 100%);
+    height: auto;
+    min-height: 100px;
+  }
+  .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary .message-text {
+    margin-inline: 0;
+  }
+  .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary .hero-text h1 {
+    text-align: start;
+    margin-inline: 0;
+    padding-inline: 40px;
+    font-size: 17px;
+  }
+  .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary .hero-text h2 {
+    margin-block-end: 0;
+  }
+}
+[narrow] .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .main-content-inner {
+  align-items: stretch;
+  margin-block-start: -30px;
+}
+[narrow] .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .action-buttons {
+  text-align: start;
+  justify-content: flex-start;
+}
+[narrow] .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .pinnable-sites-list {
+  max-width: none;
+}
+[narrow] .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .pinnable-sites-list .pinnable-sites-pin-button {
+  min-width: 62px;
+}
+[narrow] .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-main .main-content .tile-title {
+  font-size: 13px;
+}
+[narrow] .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary {
+  background: linear-gradient(0deg, light-dark(rgb(252, 245, 240), #210340) 0%, light-dark(rgb(250, 236, 241), #210340) 57%, light-dark(rgb(245, 212, 245), #210340) 100%);
+  height: auto;
+  min-height: 100px;
+}
+[narrow] .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary .message-text {
+  margin-inline: 0;
+}
+[narrow] .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary .hero-text h1 {
+  text-align: start;
+  margin-inline: 0;
+  padding-inline: 40px;
+  font-size: 17px;
+}
+[narrow] .onboardingContainer:has(.pinnable-sites-list) .screen[pos=split] .section-secondary .hero-text h2 {
+  margin-block-end: 0;
 }
 
 .onboardingContainer:has(.embedded-backup-restore-container) .screen[pos=split][fullscreen] .section-main .main-content {
@@ -3467,14 +3549,14 @@ html {
   display: flex;
   flex-direction: column;
   padding: 0;
-  gap: var(--space-medium);
+  gap: 16px;
   max-width: 300px;
 }
 .onboardingContainer .pinnable-sites-list .pinnable-sites-item {
   display: flex;
   flex-direction: row;
   align-items: center;
-  padding: 4px;
+  padding-inline: 8px;
   list-style: none;
   border: 1px solid var(--border-color);
   border-radius: var(--border-radius-medium);
@@ -3512,7 +3594,7 @@ html {
   opacity: 0;
   pointer-events: none;
   min-width: 62px;
-  padding-block: 8px;
+  padding-block: 7px;
   transition: opacity 100ms;
 }
 @starting-style {

browser/components/aboutwelcome/content/aboutwelcome.css

@@ -89,7 +89,7 @@
   min-height: var(--content-height);
   width: 100%;
 
-  & > :last-child {
+  & > :last-child:not(.chat-bubble-user) {
     padding-block-end: var(--smart-window-fade-size);
   }
 

browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css

@@ -91,7 +91,6 @@ export const AIWindow = {
     if (!this._windowStates.has(win)) {
       this._windowStates.set(win, {});
       this.initializeAITabsToolbar(win);
-      this._updateToolbarButtonPositions(win);
       this._initializeAskButtonOnToolbox(win);
       const windowArgs = win?.arguments?.[1];
       if (
@@ -283,32 +282,47 @@ export const AIWindow = {
     if (modeSwitcherButton) {
       modeSwitcherButton.hidden = !this.isAIWindowEnabled() || isPrivateWindow;
     }
+    if (!isPrivateWindow) {
+      this._updateToolbarButtonPositions(win);
+    }
   },
 
   _onTabstripOrientationChange() {
-    this._forEachWindow(win => this._updateToolbarButtonPositions(win));
+    this._forEachWindow(win => {
+      if (!lazy.PrivateBrowsingUtils.isWindowPrivate(win)) {
+        this._updateToolbarButtonPositions(win);
+      }
+    });
   },
 
-  _updateToolbarButtonPositions(win, { isToggling = false } = {}) {
+  _updateToolbarButtonPositions(win) {
     const modeSwitcherButton = win.document.getElementById("ai-window-toggle");
     const hamburgerMenu = win.document.getElementById("PanelUI-button");
-
+    const hamburgerMenuShouldBeAdjacent =
+      this.isAIWindowEnabled() || this.verticalTabsEnabled;
     const targetToolbar = win.document.getElementById(
       this.verticalTabsEnabled ? "nav-bar" : "TabsToolbar"
     );
     const titlebarContainer = targetToolbar.querySelector(
       ".titlebar-buttonbox-container"
     );
+    const postTabsSpacer = win.document
+      .getElementById("nav-bar")
+      .querySelector('.titlebar-spacer[type="post-tabs"]');
 
-    titlebarContainer.after(modeSwitcherButton);
+    if (modeSwitcherButton.previousElementSibling !== titlebarContainer) {
+      titlebarContainer.after(modeSwitcherButton);
+    }
 
-    if (this.isAIWindowActive(win) || this.verticalTabsEnabled) {
+    if (
+      hamburgerMenuShouldBeAdjacent &&
+      modeSwitcherButton.nextElementSibling !== hamburgerMenu
+    ) {
       modeSwitcherButton.after(hamburgerMenu);
-    } else if (isToggling) {
-      // Restore hamburger menu to its original position in nav-bar.
-      const postTabsSpacer = win.document
-        .getElementById("nav-bar")
-        .querySelector('.titlebar-spacer[type="post-tabs"]');
+    } else if (
+      !hamburgerMenuShouldBeAdjacent &&
+      hamburgerMenu.nextElementSibling !== postTabsSpacer
+    ) {
       postTabsSpacer.before(hamburgerMenu);
     }
   },
@@ -693,7 +707,6 @@ export const AIWindow = {
       win.document.documentElement.toggleAttribute("ai-window");
 
       this._reconcileNewTabPages(win, newTabPref, homePagePref);
-      this._updateToolbarButtonPositions(win, { isToggling: true });
       this._initializeAskButtonOnToolbox(win);
       Services.obs.notifyObservers(
         win,