Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-15 13:09:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1887789 part 1: Fixes to Accessible::LandmarkRole. r=morgan

Browse Source 
1. The ARIA role should take precedence over the HTML tag.
2. The ARIA region role should only be conditionally treated as a landmark. Use the Gecko role to determine this.
3. Change some other cases to use the Gecko role instead of directly checking the name for consistency and to avoid duplicated logic.

These fixes are tested in the next patch.

Differential Revision: https://phabricator.services.mozilla.com/D209099
This commit is contained in:
James Teh 2024-05-08 06:04:47 +00:00
parent c34cf367c2
commit 94794e02dc
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
accessible/basetypes/Accessible.cpp
View File

@ -508,6 +508,24 @@ const Accessible* Accessible::ActionAncestor() const {
}
nsStaticAtom* Accessible::LandmarkRole() const {
// For certain cases below (e.g. ARIA region, HTML <header>), whether it is
// actually a landmark is conditional. Rather than duplicating that
// conditional logic here, we check the Gecko role.
if (const nsRoleMapEntry* roleMapEntry = ARIARoleMap()) {
// Explicit ARIA role should take precedence.
if (roleMapEntry->Is(nsGkAtoms::region)) {
if (Role() == roles::REGION) {
return nsGkAtoms::region;
}
} else if (roleMapEntry->Is(nsGkAtoms::form)) {
if (Role() == roles::FORM) {
return nsGkAtoms::form;
}
} else if (roleMapEntry->IsOfType(eLandmark)) {
return roleMapEntry->roleAtom;
}
}
nsAtom* tagName = TagName();
if (!tagName) {
// Either no associated content, or no cache.
@ -539,13 +557,13 @@ nsStaticAtom* Accessible::LandmarkRole() const {
}
if (tagName == nsGkAtoms::section) {
if (!NameIsEmpty()) {
if (Role() == roles::REGION) {
return nsGkAtoms::region;
}
}
if (tagName == nsGkAtoms::form) {
if (!NameIsEmpty()) {
if (Role() == roles::FORM_LANDMARK) {
return nsGkAtoms::form;
}
}
@ -554,10 +572,7 @@ nsStaticAtom* Accessible::LandmarkRole() const {
return nsGkAtoms::search;
}
const nsRoleMapEntry* roleMapEntry = ARIARoleMap();
return roleMapEntry && roleMapEntry->IsOfType(eLandmark)
? roleMapEntry->roleAtom
: nullptr;
return nullptr;
}
nsStaticAtom* Accessible::ComputedARIARole() const {