Merge pull request #1003 from jonathanmendez/main-merge_2026060800

Enterprise main merge 2026060800

Author: jonathanmendez

Cargo.lock

@@ -314,7 +314,10 @@ hashbrown_0_13 = { package = "hashbrown", path = "build/rust/hashbrown-0.13" }
 hashbrown_0_14 = { package = "hashbrown", path = "build/rust/hashbrown-0.14" }
 
 # Patch `hashbrown` 0.15.* to depend on 0.16.*
-hashbrown_0_15 = { package = "hashbrown", path = "build/rust/hashbrown" }
+hashbrown_0_15 = { package = "hashbrown", path = "build/rust/hashbrown-0.15" }
+
+# Patch `hashbrown` 0.16.* to depend on 0.17.*
+hashbrown_0_16 = { package = "hashbrown", path = "build/rust/hashbrown" }
 
 # Patch `hashlink` 0.10.* to 0.11.*
 # This technically breaks `hashbrown::DefaultHashBuilder: Copy`, but it's not something we use.

Cargo.toml

@@ -739,22 +739,32 @@ void nsAccessibilityService::NotifyAnchorPositionedScrollUpdate(
 
 void nsAccessibilityService::NotifyAttrElementWillChange(
     mozilla::dom::Element* aElement, nsAtom* aAttr) {
-  mozilla::dom::Document* doc = aElement->OwnerDoc();
-  MOZ_ASSERT(doc);
-  if (DocAccessible* docAcc = GetDocAccessible(doc)) {
+  if (DocAccessible* docAcc = GetDocAccessible(aElement->GetComposedDoc())) {
     docAcc->AttrElementWillChange(aElement, aAttr);
   }
 }
 
 void nsAccessibilityService::NotifyAttrElementChanged(
     mozilla::dom::Element* aElement, nsAtom* aAttr) {
-  mozilla::dom::Document* doc = aElement->OwnerDoc();
-  MOZ_ASSERT(doc);
-  if (DocAccessible* docAcc = GetDocAccessible(doc)) {
+  if (DocAccessible* docAcc = GetDocAccessible(aElement->GetComposedDoc())) {
     docAcc->AttrElementChanged(aElement, aAttr);
   }
 }
 
+void nsAccessibilityService::NotifyARIAAttributeDefaultWillChange(
+    mozilla::dom::Element* aElement, nsAtom* aAttribute, AttrModType aModType) {
+  if (DocAccessible* docAcc = GetDocAccessible(aElement->GetComposedDoc())) {
+    docAcc->ARIAAttributeDefaultWillChange(aElement, aAttribute, aModType);
+  }
+}
+
+void nsAccessibilityService::NotifyARIAAttributeDefaultChanged(
+    mozilla::dom::Element* aElement, nsAtom* aAttribute, AttrModType aModType) {
+  if (DocAccessible* docAcc = GetDocAccessible(aElement->GetComposedDoc())) {
+    docAcc->ARIAAttributeDefaultChanged(aElement, aAttribute, aModType);
+  }
+}
+
 void nsAccessibilityService::AriaNotify(
     nsINode* aNode, const nsAString& aAnnouncement,
     const mozilla::dom::AriaNotificationOptions& aOptions) {

accessible/base/nsAccessibilityService.cpp

@@ -313,6 +313,17 @@ class nsAccessibilityService final : public mozilla::a11y::DocManager,
    */
   void NotifyAttrElementChanged(mozilla::dom::Element* aElement, nsAtom* aAttr);
 
+  /**
+   * Notify accessibility that an ARIA attribute reflected from ElementInternals
+   * is about to change / has changed. See dom::ElementInternals.
+   */
+  void NotifyARIAAttributeDefaultWillChange(mozilla::dom::Element* aElement,
+                                            nsAtom* aAttribute,
+                                            AttrModType aModType);
+  void NotifyARIAAttributeDefaultChanged(mozilla::dom::Element* aElement,
+                                         nsAtom* aAttribute,
+                                         AttrModType aModType);
+
   void AriaNotify(nsINode* aNode, const nsAString& aAnnouncement,
                   const mozilla::dom::AriaNotificationOptions& aOptions);
 

accessible/base/nsAccessibilityService.h

@@ -151,8 +151,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(DocAccessible, LocalAccessible)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DocAccessible)
-  NS_INTERFACE_MAP_ENTRY(nsIDocumentObserver)
-  NS_INTERFACE_MAP_ENTRY(nsIMutationObserver)
   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END_INHERITING(HyperTextAccessible)
 
@@ -721,9 +719,6 @@ nsRect DocAccessible::RelativeBounds(nsIFrame** aRelativeFrame) const {
 // DocAccessible protected member
 nsresult DocAccessible::AddEventListeners() {
   SelectionMgr()->AddDocSelectionListener(mPresShell);
-
-  // Add document observer.
-  mDocumentNode->AddObserver(this);
   return NS_OK;
 }
 
@@ -732,10 +727,6 @@ nsresult DocAccessible::RemoveEventListeners() {
   // Remove listeners associated with content documents
   NS_ASSERTION(mDocumentNode, "No document during removal of listeners.");
 
-  if (mDocumentNode) {
-    mDocumentNode->RemoveObserver(this);
-  }
-
   if (mScrollWatchTimer) {
     mScrollWatchTimer->Cancel();
     mScrollWatchTimer = nullptr;
@@ -839,12 +830,6 @@ std::pair<nsPoint, nsRect> DocAccessible::ComputeScrollData(
   return {scrollPoint, scrollRange};
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// nsIDocumentObserver
-
-NS_IMPL_NSIDOCUMENTOBSERVER_CORE_STUB(DocAccessible)
-NS_IMPL_NSIDOCUMENTOBSERVER_LOAD_STUB(DocAccessible)
-
 // When a reflected element IDL attribute changes, we might get the following
 // synchronous calls:
 // 1. AttributeWillChange for the element.
@@ -1089,11 +1074,6 @@ void DocAccessible::ARIAActiveDescendantChanged(LocalAccessible* aAccessible) {
   }
 }
 
-void DocAccessible::ContentAppended(nsIContent* aFirstNewContent,
-                                    const ContentAppendInfo&) {
-  MaybeHandleChangeToHiddenNameOrDescription(aFirstNewContent);
-}
-
 void DocAccessible::ElementStateChanged(dom::Document* aDocument,
                                         dom::Element* aElement,
                                         dom::ElementState aStateMask) {
@@ -1225,34 +1205,6 @@ void DocAccessible::ElementStateChanged(dom::Document* aDocument,
   }
 }
 
-void DocAccessible::CharacterDataWillChange(nsIContent* aContent,
-                                            const CharacterDataChangeInfo&) {}
-
-void DocAccessible::CharacterDataChanged(nsIContent* aContent,
-                                         const CharacterDataChangeInfo&) {
-  MaybeHandleChangeToHiddenNameOrDescription(aContent);
-}
-
-void DocAccessible::ContentInserted(nsIContent* aChild,
-                                    const ContentInsertInfo&) {
-  MaybeHandleChangeToHiddenNameOrDescription(aChild);
-}
-
-void DocAccessible::ContentWillBeRemoved(nsIContent* aChildNode,
-                                         const ContentRemoveInfo&) {
-#ifdef A11Y_LOG
-  if (logging::IsEnabled(logging::eTree)) {
-    logging::MsgBegin("TREE", "DOM content removed; doc: %p", this);
-    logging::Node("container node", aChildNode->GetParent());
-    logging::Node("content node", aChildNode);
-    logging::MsgEnd();
-  }
-#endif
-  ContentRemoved(aChildNode);
-}
-
-void DocAccessible::ParentChainChanged(nsIContent* aContent) {}
-
 ////////////////////////////////////////////////////////////////////////////////
 // LocalAccessible
 

accessible/generic/DocAccessible.cpp

@@ -43,7 +43,6 @@ class TNotification;
  * all use this class to represent the doc they contain.
  */
 class DocAccessible : public HyperTextAccessible,
-                      public nsIDocumentObserver,
                       public nsSupportsWeakReference {
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DocAccessible, LocalAccessible)
@@ -54,14 +53,11 @@ class DocAccessible : public HyperTextAccessible,
  public:
   DocAccessible(Document* aDocument, PresShell* aPresShell);
 
-  // nsIDocumentObserver
-  NS_DECL_NSIDOCUMENTOBSERVER
-
   // LocalAccessible
   virtual void Init();
-  virtual void Shutdown() override;
-  virtual nsIFrame* GetFrame() const override;
-  virtual nsINode* GetNode() const override;
+  void Shutdown() override;
+  nsIFrame* GetFrame() const override;
+  nsINode* GetNode() const override;
   Document* DocumentNode() const { return mDocumentNode; }
 
   virtual mozilla::a11y::ENameValueFlag DirectName(
@@ -442,6 +438,26 @@ class DocAccessible : public HyperTextAccessible,
    */
   uint64_t EffectiveCacheDomains() const;
 
+  /**
+   * For hidden subtrees, fire a name/description change event if the subtree
+   * is a target of aria-labelledby/describedby.
+   * This does nothing if it is called on a node which is not part of a hidden
+   * aria-labelledby/describedby target.
+   */
+  void MaybeHandleChangeToHiddenNameOrDescription(nsIContent* aChild);
+  void AttributeWillChange(dom::Element* aElement, int32_t aNameSpaceID,
+                           nsAtom* aAttribute, AttrModType aModType);
+  virtual void AttributeChanged(dom::Element* aElement, int32_t aNameSpaceID,
+                                nsAtom* aAttribute, AttrModType aModType,
+                                const nsAttrValue* aOldValue);
+  void ElementStateChanged(dom::Document* aDocument, dom::Element* aElement,
+                           dom::ElementState aStateMask);
+  void ARIAAttributeDefaultWillChange(dom::Element* aElement,
+                                      nsAtom* aAttribute, AttrModType aModType);
+
+  void ARIAAttributeDefaultChanged(dom::Element* aElement, nsAtom* aAttribute,
+                                   AttrModType aModType);
+
  protected:
   virtual ~DocAccessible();
 
@@ -860,14 +876,6 @@ class DocAccessible : public HyperTextAccessible,
    */
   void TrackMovedAccessible(LocalAccessible* aAcc);
 
-  /**
-   * For hidden subtrees, fire a name/description change event if the subtree
-   * is a target of aria-labelledby/describedby.
-   * This does nothing if it is called on a node which is not part of a hidden
-   * aria-labelledby/describedby target.
-   */
-  void MaybeHandleChangeToHiddenNameOrDescription(nsIContent* aChild);
-
   void MaybeHandleChangeToAriaActions(LocalAccessible* aAcc,
                                       const nsAtom* aAttribute);
 

accessible/generic/DocAccessible.h

@@ -22,11 +22,11 @@ class DocAccessibleWrap : public DocAccessible {
 
   virtual ~DocAccessibleWrap();
 
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
-  virtual void AttributeChanged(dom::Element* aElement, int32_t aNameSpaceID,
-                                nsAtom* aAttribute, AttrModType aModType,
-                                const nsAttrValue* aOldValue) override;
+  void AttributeChanged(dom::Element* aElement, int32_t aNameSpaceID,
+                        nsAtom* aAttribute, AttrModType aModType,
+                        const nsAttrValue* aOldValue) override;
 
   void QueueNewLiveRegion(LocalAccessible* aAccessible);
 

accessible/mac/DocAccessibleWrap.h

@@ -12,7 +12,7 @@ support-files = [
   "fonts/Ahem.sjs",
   "!/accessible/tests/browser/shared-head.js",
   "!/accessible/tests/mochitest/*.js",
-  "!/accessible/tests/mochitest/events/slow_image.sjs",
+  "!/accessible/tests/browser/events/slow_doc.sjs",
   "!/accessible/tests/mochitest/letters.gif",
   "!/accessible/tests/mochitest/moz.png",
 ]

accessible/tests/browser/e10s/browser.toml

@@ -420,15 +420,15 @@ addAccessibleTask(
     );
     await invokeContentTask(browser, [], () => {
       content.document.getElementById("iframe").src =
-        'data:text/html,<img src="http://example.com/a11y/accessible/tests/mochitest/events/slow_image.sjs">';
+        "https://example.com/browser/accessible/tests/browser/events/slow_doc.sjs?second";
     });
     const iframeDoc = (await reordered).accessible.firstChild;
     testStates(iframeDoc, STATE_BUSY, EXT_STATE_STALE, 0, 0);
 
     info("Finishing load of iframe doc");
     let loadCompleted = waitForEvent(EVENT_DOCUMENT_LOAD_COMPLETE, iframeDoc);
     await fetch(
-      "https://example.com/a11y/accessible/tests/mochitest/events/slow_image.sjs?complete"
+      "https://example.com/browser/accessible/tests/browser/events/slow_doc.sjs?scriptFinish"
     );
     await loadCompleted;
     testStates(iframeDoc, 0, 0, STATE_BUSY, EXT_STATE_STALE);

accessible/tests/browser/e10s/browser_caching_states.js

@@ -0,0 +1,20 @@
+<!doctype html>
+<style>
+  *:nth-child(odd) {
+    display: contents;
+    inset-block: 41%;
+    scroll-padding-block: 98% auto;
+  }
+</style>
+<script>
+  document.addEventListener("DOMContentLoaded", () => {
+    a.selectedIndex = 1;
+    a.remove(0);
+    window.__foo = a.options.length;
+  })
+</script>
+<datalist tabindex="-1">
+</datalist>
+<select id="a" size="37">
+  <optgroup>
+    <option>