[pull] main from mozilla-firefox:main

accessible/base/nsAccessibilityService.cpp

@@ -884,6 +884,19 @@ void nsAccessibilityService::TableLayoutGuessMaybeChanged(
   }
 }
 
+void nsAccessibilityService::ComboboxValueChanged(nsIContent* aSelect) {
+  DocAccessible* document =
+      GetDocAccessible(aSelect->OwnerDoc()->GetPresShell());
+  if (!document) {
+    return;
+  }
+  if (LocalAccessible* accessible = document->GetAccessible(aSelect)) {
+    MOZ_ASSERT(accessible->IsCombobox());
+    document->FireDelayedEvent(nsIAccessibleEvent::EVENT_TEXT_VALUE_CHANGE,
+                               accessible);
+  }
+}
+
 void nsAccessibilityService::ComboboxOptionMaybeChanged(
     PresShell* aPresShell, nsIContent* aMutatingNode) {
   DocAccessible* document = GetDocAccessible(aPresShell);

accessible/base/nsAccessibilityService.h

@@ -203,10 +203,12 @@ class nsAccessibilityService final : public mozilla::a11y::DocManager,
                                     nsIContent* aContent);
 
   /**
-   * Notifies when a combobox <option> text or label changes.
+   * Notifies when a combobox's <option> text or label changes.
    */
   void ComboboxOptionMaybeChanged(mozilla::PresShell*,
                                   nsIContent* aMutatingNode);
+  // Notifies when a combobox's selected index changes.
+  void ComboboxValueChanged(nsIContent*);
 
   void UpdateText(mozilla::PresShell* aPresShell, nsIContent* aContent);
 

accessible/base/nsCoreUtils.cpp

@@ -24,7 +24,6 @@
 #include "mozilla/MouseEvents.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ScrollContainerFrame.h"
-#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/TouchEvents.h"
 #include "nsGkAtoms.h"
 
@@ -36,6 +35,10 @@
 #include "nsTreeColumns.h"
 #include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/HTMLOptGroupElement.h"
+#include "mozilla/dom/HTMLOptionElement.h"
+#include "mozilla/dom/HTMLSelectElement.h"
+#include "mozilla/dom/AncestorIterator.h"
 #include "mozilla/dom/ElementInternals.h"
 #include "mozilla/dom/HTMLLabelElement.h"
 #include "mozilla/dom/MouseEventBinding.h"
@@ -584,26 +587,33 @@ bool nsCoreUtils::CanCreateAccessibleWithoutFrame(nsIContent* aContent) {
   if (!element) {
     return false;
   }
-  if (!element->HasServoData() || Servo_Element_IsDisplayNone(element)) {
-    // Out of the flat tree or in a display: none subtree.
-    return false;
+  // <option> and <optgroup> can create an accessible for comboboxes, if our
+  // select can also create an accessible (even if they're display: none)
+  if (auto* option = dom::HTMLOptionElement::FromNode(element)) {
+    if (auto* select = option->GetSelect(); select && select->IsCombobox()) {
+      element = select;
+    }
+  } else if (auto* optgroup = dom::HTMLOptGroupElement::FromNode(element)) {
+    if (auto* select = optgroup->GetSelect(); select && select->IsCombobox()) {
+      element = select;
+    }
   }
 
   // If we aren't display: contents or option/optgroup we can't create an
   // accessible without frame. Our select combobox code relies on the latter.
-  if (!element->IsDisplayContents() &&
-      !element->IsAnyOfHTMLElements(nsGkAtoms::option, nsGkAtoms::optgroup)) {
+  // Note that we need to check primary frame explicitly for the <select> case
+  // above.
+  if (!element->GetPrimaryFrame() && !element->IsDisplayContents()) {
     return false;
   }
 
   // Even if we're display: contents or optgroups, we might not be able to
   // create an accessible if we're in a content-visibility: hidden subtree.
   //
   // To check that, find the closest ancestor element with a frame.
-  for (nsINode* ancestor = element->GetFlattenedTreeParentNode();
-       ancestor && ancestor->IsContent();
-       ancestor = ancestor->GetFlattenedTreeParentNode()) {
-    if (nsIFrame* f = ancestor->AsContent()->GetPrimaryFrame()) {
+  for (nsIContent* c :
+       element->InclusiveFlatTreeAncestorsOfType<nsIContent>()) {
+    if (nsIFrame* f = c->GetPrimaryFrame()) {
       if (f->HidesContent(nsIFrame::IncludeContentVisibility::Hidden) ||
           f->IsHiddenByContentVisibilityOnAnyAncestor(
               nsIFrame::IncludeContentVisibility::Hidden)) {

accessible/generic/RootAccessible.cpp

@@ -127,7 +127,7 @@ const char* const kEventTypes[] = {
 #endif
     // Fired when list or tree selection changes.
     "select",
-    // Fired when value changes immediately, wether or not focused changed.
+    // Fired when value changes immediately, whether or not focused changed.
     "ValueChange", "AlertActive", "TreeRowCountChanged", "TreeInvalidated",
     // add ourself as a OpenStateChange listener (custom event fired in
     // tree.xml)

browser/base/content/test/about/browser_aboutNetError.js

@@ -292,47 +292,76 @@ add_task(async function onlyAllow3DESWithDeprecatedTLS() {
     }
   );
 
-  // 3DES can be disabled separately.
-  Services.prefs.setBoolPref(DES_PREF, false);
-  await BrowserTestUtils.withNewTab(
-    { gBrowser, url: "about:blank" },
-    async browser => {
-      BrowserTestUtils.startLoadingURIString(browser, TRIPLEDES_PAGE);
-      await BrowserTestUtils.waitForErrorPage(browser);
-      let prefWasReset = TestUtils.waitForPrefChange(DES_PREF);
-      await SpecialPowers.spawn(browser, [], async function () {
-        const doc = content.document;
-        const netErrorCard =
-          doc.querySelector("net-error-card")?.wrappedJSObject;
-        Assert.ok(netErrorCard, "netErrorCard is rendered.");
-
-        netErrorCard.advancedButton.scrollIntoView();
-        EventUtils.synthesizeMouseAtCenter(
-          netErrorCard.advancedButton,
-          {},
-          content
-        );
-        await ContentTaskUtils.waitForCondition(
-          () => ContentTaskUtils.isVisible(netErrorCard.advancedContainer),
-          "Advanced container is visible"
-        );
-
-        const prefResetButton = netErrorCard.prefResetButton;
-        Assert.ok(prefResetButton, "prefResetButton exists in the DOM.");
-        netErrorCard.prefResetButton.scrollIntoView();
-        await ContentTaskUtils.waitForCondition(
-          () => ContentTaskUtils.isVisible(netErrorCard.prefResetButton),
-          "Pref reset button is visible"
-        );
-        ok(
-          ContentTaskUtils.isVisible(prefResetButton),
-          "prefResetButton is visible"
-        );
-        prefResetButton.click();
-      });
-      await prefWasReset;
-    }
-  );
+  for (let feltPrivacy of [true, false]) {
+    // 3DES can be disabled separately.
+    Services.prefs.setBoolPref(DES_PREF, false);
+    await SpecialPowers.pushPrefEnv({
+      set: [["security.certerrors.felt-privacy-v1", feltPrivacy]],
+    });
+
+    await BrowserTestUtils.withNewTab(
+      { gBrowser, url: "about:blank" },
+      async browser => {
+        BrowserTestUtils.startLoadingURIString(browser, TRIPLEDES_PAGE);
+        await BrowserTestUtils.waitForErrorPage(browser);
+        let prefWasReset = TestUtils.waitForPrefChange(DES_PREF);
+
+        if (feltPrivacy) {
+          await SpecialPowers.spawn(browser, [], async function () {
+            const doc = content.document;
+            const netErrorCard =
+              doc.querySelector("net-error-card")?.wrappedJSObject;
+            Assert.ok(netErrorCard, "netErrorCard is rendered.");
+
+            netErrorCard.advancedButton.scrollIntoView();
+            EventUtils.synthesizeMouseAtCenter(
+              netErrorCard.advancedButton,
+              {},
+              content
+            );
+            await ContentTaskUtils.waitForCondition(
+              () => ContentTaskUtils.isVisible(netErrorCard.advancedContainer),
+              "Advanced container is visible"
+            );
+
+            const prefResetButton = netErrorCard.prefResetButton;
+            Assert.ok(prefResetButton, "prefResetButton exists in the DOM.");
+            netErrorCard.prefResetButton.scrollIntoView();
+            await ContentTaskUtils.waitForCondition(
+              () => ContentTaskUtils.isVisible(netErrorCard.prefResetButton),
+              "Pref reset button is visible"
+            );
+            ok(
+              ContentTaskUtils.isVisible(prefResetButton),
+              "prefResetButton is visible"
+            );
+
+            prefResetButton.click();
+          });
+        } else {
+          await SpecialPowers.spawn(browser, [], async function () {
+            const doc = content.document;
+
+            const prefResetButton = doc.getElementById("prefResetButton");
+            Assert.ok(prefResetButton, "prefResetButton exists in the DOM.");
+
+            await ContentTaskUtils.waitForCondition(
+              () => ContentTaskUtils.isVisible(prefResetButton),
+              "Pref reset button is visible"
+            );
+            ok(
+              ContentTaskUtils.isVisible(prefResetButton),
+              "prefResetButton is visible"
+            );
+
+            prefResetButton.click();
+          });
+        }
+
+        await prefWasReset;
+      }
+    );
+  }
 
   resetPrefs();
 });

browser/base/content/test/popupNotifications/browser.toml

@@ -106,6 +106,9 @@ skip-if = [
 ]
 
 ["browser_popupNotification_security_delay.js"]
+skip-if = [
+   "os == 'win' && arch == 'x86'", # Bug 1882452
+]
 
 ["browser_popupNotification_selection_required.js"]
 skip-if = [

browser/components/aboutwelcome/content-src/aboutwelcome.scss

@@ -2265,6 +2265,14 @@ html {
       background: url('chrome://global/skin/icons/arrow-down.svg') center center / 100% no-repeat;
     }
 
+    .external-link-icon {
+      width: 1.2em;
+      height: 1.3em;
+      -moz-context-properties: fill;
+      fill: currentColor;
+      background: url('chrome://global/skin/icons/open-in-new.svg') center center / 100% no-repeat;
+    }
+
     &[aria-expanded='true'] {
       border-end-start-radius: 0;
       border-end-end-radius: 0;
@@ -2330,7 +2338,8 @@ html {
         }
 
         &:has(+ .content-tile.has-header) {
-          button.tile-header[aria-expanded='false'] {
+          button.tile-header[aria-expanded='false'],
+          button.tile-header[role='link'] {
             border-bottom: none;
           }
         }
@@ -2349,12 +2358,7 @@ html {
           display: flex;
           flex-direction: column;
 
-          .header-title {
-            font-weight: var(--heading-font-weight);
-            line-height: 1.5;
-          }
-
-          .header-subtitle {
+          .header-title, .header-subtitle {
             font-weight: normal;
             line-height: 1.5;
           }

browser/components/aboutwelcome/content-src/components/ContentTiles.jsx

@@ -170,8 +170,20 @@ export const ContentTiles = props => {
 
   const toggleTile = (index, tile) => {
     const tileId = `${tile.type}${tile.id ? "_" : ""}${tile.id ?? ""}_header`;
-    setExpandedTileIndex(prevIndex => (prevIndex === index ? null : index));
     AboutWelcomeUtils.sendActionTelemetry(props.messageId, tileId);
+
+    if (tile.type === "link" && tile.action) {
+      props.handleAction(
+        {
+          currentTarget: {
+            value: tileId,
+          },
+        },
+        tile.action
+      );
+    } else {
+      setExpandedTileIndex(prevIndex => (prevIndex === index ? null : index));
+    }
   };
 
   const toggleTiles = () => {
@@ -194,6 +206,14 @@ export const ContentTiles = props => {
     const isExpanded = expandedTileIndex === index;
     const { header, title, subtitle } = tile;
 
+    const tileHeaderProps =
+      tile.type === "link"
+        ? { role: "link" }
+        : {
+            "aria-expanded": isExpanded,
+            "aria-controls": `tile-content-${index}`,
+          };
+
     return (
       <div
         key={index}
@@ -204,8 +224,7 @@ export const ContentTiles = props => {
           <button
             className="tile-header secondary"
             onClick={() => toggleTile(index, tile)}
-            aria-expanded={isExpanded}
-            aria-controls={`tile-content-${index}`}
+            {...tileHeaderProps}
             style={AboutWelcomeUtils.getValidStyle(header.style, HEADER_STYLES)}
           >
             <div className="header-text-container">
@@ -218,7 +237,11 @@ export const ContentTiles = props => {
                 </Localized>
               )}
             </div>
-            <div className="arrow-icon"></div>
+            <div
+              className={
+                tile.type === "link" ? "external-link-icon" : "arrow-icon"
+              }
+            ></div>
           </button>
         )}
         {(title || subtitle) && (
@@ -241,7 +264,7 @@ export const ContentTiles = props => {
             )}
           </div>
         )}
-        {isExpanded || !header ? (
+        {tile.type !== "link" && (isExpanded || !header) ? (
           <div className="tile-content" id={`tile-content-${index}`}>
             {tile.type === "addons-picker" && tile.data && (
               <AddonsPicker