Merge pull request #295 from mozilla/enterprise-main_merge_20251218

Enterprise main merge 20251218

Author: lissyx

.gitignore

@@ -394,3 +394,7 @@ toolkit/crashreporter/minidump-analyzer/target/
 
 # Ignore personal preferences files
 CLAUDE.local.md
+
+# Ignore .json.gz (typically profiles) in the root directory
+# lint-ignore-next-line: git-only
+/*.json.gz

accessible/basetypes/Accessible.h

@@ -794,6 +794,20 @@ class Accessible {
    */
   virtual bool HasPrimaryAction() const = 0;
 
+  /**
+   * Return true if this Accessible has custom actions, even if those actions
+   * aren't currently available. Custom actions are secondary actions provided
+   * by the author using associated elements (e.g. via aria-actions), in
+   * contrast to actions provided by Gecko on the element itself (e.g. click).
+   * Custom actions are queried using RelationByType(RelationType::ACTION).
+   * However, there can be cases where there are associated custom actions, but
+   * the target elements are hidden; e.g. because the origin element isn't
+   * focused. The client might need to know there are actions even if it can't
+   * currently query them. For this case, this function will return true, even
+   * though RelationByType will return nothing.
+   */
+  virtual bool HasCustomActions() const = 0;
+
  protected:
   // Some abstracted group utility methods.
 

accessible/generic/LocalAccessible.cpp

@@ -1121,7 +1121,7 @@ already_AddRefed<AccAttributes> LocalAccessible::Attributes() {
     attribIter.ExposeAttr(attributes);
   }
 
-  if (nsAccUtils::HasARIAAttr(Elm(), nsGkAtoms::aria_actions)) {
+  if (HasCustomActions()) {
     attributes->SetAttribute(nsGkAtoms::hasActions, true);
   }
 
@@ -4091,7 +4091,7 @@ already_AddRefed<AccAttributes> LocalAccessible::BundleFieldsForCache(
       fields->SetAttribute(CacheKey::ARIAAttributes, DeleteEntry());
     }
 
-    if (nsAccUtils::HasARIAAttr(Elm(), nsGkAtoms::aria_actions)) {
+    if (HasCustomActions()) {
       fields->SetAttribute(CacheKey::HasActions, true);
     } else if (IsUpdatePush(CacheDomain::ARIA)) {
       fields->SetAttribute(CacheKey::HasActions, DeleteEntry());
@@ -4566,3 +4566,8 @@ bool LocalAccessible::HasARIAAttr(nsAtom* aAttrName) const {
   return mContent ? nsAccUtils::HasDefinedARIAToken(mContent, aAttrName)
                   : false;
 }
+
+bool LocalAccessible::HasCustomActions() const {
+  dom::Element* el = Elm();
+  return el && nsAccUtils::HasARIAAttr(el, nsGkAtoms::aria_actions);
+}

accessible/generic/LocalAccessible.h

@@ -496,6 +496,8 @@ class LocalAccessible : public nsISupports, public Accessible {
 
   virtual bool DoAction(uint8_t aIndex) const override;
 
+  virtual bool HasCustomActions() const override;
+
   virtual KeyBinding AccessKey() const override;
 
   /**

accessible/ipc/RemoteAccessible.cpp

@@ -1952,9 +1952,8 @@ already_AddRefed<AccAttributes> RemoteAccessible::Attributes() {
       attributes->SetAttribute(nsGkAtoms::ispopup, std::move(popupType));
     }
 
-    if (auto hasActions =
-            mCachedFields->GetAttribute<bool>(CacheKey::HasActions)) {
-      attributes->SetAttribute(nsGkAtoms::hasActions, *hasActions);
+    if (HasCustomActions()) {
+      attributes->SetAttribute(nsGkAtoms::hasActions, true);
     }
 
     nsString detailsFrom;
@@ -2668,6 +2667,14 @@ void RemoteAccessible::PasteText(int32_t aPosition) {
   (void)mDoc->SendPasteText(mID, aPosition);
 }
 
+bool RemoteAccessible::HasCustomActions() const {
+  if (RequestDomainsIfInactive(CacheDomain::ARIA) || !mCachedFields) {
+    return false;
+  }
+  auto hasActions = mCachedFields->GetAttribute<bool>(CacheKey::HasActions);
+  return hasActions && *hasActions;
+}
+
 size_t RemoteAccessible::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) {
   return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
 }

accessible/ipc/RemoteAccessible.h

@@ -392,6 +392,7 @@ class RemoteAccessible : public Accessible, public HyperTextAccessibleBase {
 
   virtual bool HasPrimaryAction() const override;
 
+  virtual bool HasCustomActions() const override;
   virtual bool IsEditable() const override;
 
 #if !defined(XP_WIN)

accessible/tests/browser/tree/browser_searchbar.js

@@ -8,6 +8,12 @@ const { CustomizableUITestUtils } = ChromeUtils.importESModule(
 );
 let gCUITestUtils = new CustomizableUITestUtils(window);
 
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.search.widget.new", false]],
+  });
+});
+
 // eslint-disable-next-line camelcase
 add_task(async function test_searchbar_a11y_tree() {
   let searchbar = await gCUITestUtils.addSearchBar();

accessible/tests/browser/windows/a11y_setup.py

@@ -15,7 +15,7 @@
 import comtypes.automation
 import comtypes.client
 import psutil
-from comtypes import COMError, IServiceProvider
+from comtypes import GUID, COMError, IServiceProvider
 
 CHILDID_SELF = 0
 COWAIT_DEFAULT = 0
@@ -100,6 +100,24 @@ def registerIa2Proxy():
     clsctx=comtypes.CLSCTX_INPROC_SERVER,
 )
 
+# Register UIA custom properties.
+# IUIAutomationRegistrar is in a different type library.
+uiaCoreMod = comtypes.client.GetModule(("{930299ce-9965-4dec-b0f4-a54848d4b667}",))
+uiaReg = comtypes.CoCreateInstance(
+    uiaCoreMod.CUIAutomationRegistrar._reg_clsid_,
+    interface=uiaCoreMod.IUIAutomationRegistrar,
+)
+uiaAccessibleActionsPropertyId = uiaReg.RegisterProperty(
+    byref(
+        uiaCoreMod.UIAutomationPropertyInfo(
+            GUID("{8C787AC3-0405-4C94-AC09-7A56A173F7EF}"),
+            "AccessibleActions",
+            uiaCoreMod.UIAutomationType_ElementArray,
+        )
+    )
+)
+del uiaReg, uiaCoreMod
+
 _threadLocal = threading.local()
 
 

accessible/tests/browser/windows/uia/browser_relationProps.js

@@ -12,6 +12,18 @@ function testUiaRelationArray(id, prop, targets) {
   );
 }
 
+function testCustomUiaRelationArray(id, prop, targets) {
+  return isUiaElementArray(
+    `
+      findUiaByDomId(doc, "${id}")
+      .GetCurrentPropertyValue(uia${prop}PropertyId)
+      .QueryInterface(IUIAutomationElementArray)
+    `,
+    targets,
+    `${id} has correct ${prop} targets`
+  );
+}
+
 /**
  * Test the ControllerFor property.
  */
@@ -141,3 +153,65 @@ addUiaTask(
   // The IA2 -> UIA proxy doesn't expose LabeledBy properly.
   { uiaEnabled: true, uiaDisabled: false }
 );
+
+/**
+ * Test the AccessibleActions property.
+ */
+addUiaTask(
+  `
+<dialog aria-actions="btn" id="dlg" onclick="" open>
+  Dialog with its own click listener
+  <form method="dialog">
+    <button id="btn">Close</button>
+  </form>
+</dialog>
+  `,
+  async function testActions() {
+    await definePyVar("doc", `getDocUia()`);
+    await testCustomUiaRelationArray("dlg", "AccessibleActions", ["btn"]);
+    await testCustomUiaRelationArray("btn", "AccessibleActions", []);
+  },
+  // The IA2 -> UIA proxy doesn't support AccessibleActions.
+  { uiaEnabled: true, uiaDisabled: false }
+);
+
+/**
+ * Test exposure of AriaProperties.hasactions.
+ */
+addUiaTask(
+  `
+<button id="button">button</button>
+<div role="tablist">
+  <div id="tab1" role="tab" tabindex="0" aria-actions="tab1Button">
+    tab1
+    <button id="tab1Button">tab1Button</button>
+  </div>
+  <div id="tab2" role="tab" aria-actions="tab2Button">
+    tab2
+    <button id="tab2Button" hidden>tab2Button</button>
+  </div>
+</div>
+  `,
+  async function testHasActions() {
+    await definePyVar("doc", `getDocUia()`);
+    is(
+      await runPython(`findUiaByDomId(doc, "button").CurrentAriaProperties`),
+      "",
+      "button missing hasactions"
+    );
+    // tab1 has a visible action.
+    is(
+      await runPython(`findUiaByDomId(doc, "tab1").CurrentAriaProperties`),
+      "hasactions=true",
+      "tab1 hasactions=true"
+    );
+    // tab2 has an action, but it's hidden.
+    is(
+      await runPython(`findUiaByDomId(doc, "tab2").CurrentAriaProperties`),
+      "hasactions=true",
+      "tab2 hasactions=true"
+    );
+  },
+  // The IA2 -> UIA proxy doesn't support hasactions.
+  { uiaEnabled: true, uiaDisabled: false }
+);

accessible/windows/uia/uiaRawElmProvider.cpp

@@ -596,6 +596,12 @@ uiaRawElmProvider::GetPropertyValue(PROPERTYID aPropertyId,
           ariaProperties.AppendLiteral("atomic=false");
         }
       }
+      if (acc->HasCustomActions()) {
+        if (!ariaProperties.IsEmpty()) {
+          ariaProperties += ';';
+        }
+        ariaProperties.AppendLiteral("hasactions=true");
+      }
       if (!ariaProperties.IsEmpty()) {
         aPropertyValue->vt = VT_BSTR;
         aPropertyValue->bstrVal = ::SysAllocString(ariaProperties.get());
@@ -775,6 +781,17 @@ uiaRawElmProvider::GetPropertyValue(PROPERTYID aPropertyId,
       aPropertyValue->vt = VT_I4;
       aPropertyValue->lVal = acc->GroupPosition().setSize;
       return S_OK;
+
+    default: {
+      // These can't be included as case statements because they are not
+      // constant expressions.
+      const UiaRegistrations& registrations = GetUiaRegistrations();
+      if (aPropertyId == registrations.mAccessibleActions) {
+        aPropertyValue->vt = VT_UNKNOWN | VT_ARRAY;
+        aPropertyValue->parray = AccRelationsToUiaArray({RelationType::ACTION});
+        return S_OK;
+      }
+    }
   }
 
   return S_OK;
@@ -1570,3 +1587,29 @@ SAFEARRAY* a11y::AccessibleArrayToUiaArray(const nsTArray<Accessible*>& aAccs) {
   }
   return uias;
 }
+
+const UiaRegistrations& a11y::GetUiaRegistrations() {
+  static UiaRegistrations sRegistrations = {};
+  static bool sRegistered = false;
+  if (sRegistered) {
+    return sRegistrations;
+  }
+  RefPtr<IUIAutomationRegistrar> registrar;
+  if (FAILED(CoCreateInstance(CLSID_CUIAutomationRegistrar, nullptr,
+                              CLSCTX_INPROC_SERVER, IID_IUIAutomationRegistrar,
+                              getter_AddRefs(registrar)))) {
+    return sRegistrations;
+  }
+  UIAutomationPropertyInfo actionsInfo = {
+      // https://w3c.github.io/core-aam/#ariaActions
+      // {8C787AC3-0405-4C94-AC09-7A56A173F7EF}
+      {0x8C787AC3,
+       0x0405,
+       0x4C94,
+       {0xAC, 0x09, 0x7A, 0x56, 0xA1, 0x73, 0xF7, 0xEF}},
+      L"AccessibleActions",
+      UIAutomationType_ElementArray};
+  registrar->RegisterProperty(&actionsInfo, &sRegistrations.mAccessibleActions);
+  sRegistered = true;
+  return sRegistrations;
+}