[A11y] Implement minimum role from HTML-AAM

Aaron Leventhal · Chromium LUCI CQ · commit 8ccd2ea8fc71 · 2024-06-27T19:56:07.000Z
Bug: w3c/html-aam#454 Change-Id: Ia3930b068311f26f6a7e0be8bbcce53acf820bdf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5663675 Auto-Submit: Aaron Leventhal <aleventhal@chromium.org> Commit-Queue: Mark Schillaci <mschillaci@google.com> Commit-Queue: Aaron Leventhal <aleventhal@chromium.org> Reviewed-by: Mark Schillaci <mschillaci@google.com> Cr-Commit-Position: refs/heads/main@{#1320576}
diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -2900,6 +2900,10 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
   RunHtmlTest(FILE_PATH_LITERAL("micro-clearfix-hack.html"));
 }
 
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityMinRole) {
+  RunHtmlTest(FILE_PATH_LITERAL("min-role.html"));
+}
+
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
                        AccessibilityMissingRelationTargetsAddedLater) {
   RunAriaTest(FILE_PATH_LITERAL("missing-relation-targets-added-later.html"));
diff --git a/content/test/content_test_bundle_data.filelist b/content/test/content_test_bundle_data.filelist
@@ -4357,6 +4357,8 @@ data/accessibility/html/meter-expected-win.txt
 data/accessibility/html/meter.html
 data/accessibility/html/micro-clearfix-hack-expected-blink.txt
 data/accessibility/html/micro-clearfix-hack.html
+data/accessibility/html/min-role-expected-blink.txt
+data/accessibility/html/min-role.html
 data/accessibility/html/modal-dialog-and-iframes-expected-blink.txt
 data/accessibility/html/modal-dialog-and-iframes.html
 data/accessibility/html/modal-dialog-closed-expected-android.txt
@@ -6936,8 +6938,8 @@ data/link_rel_prefetch_disable_network.html
 data/link_rel_prefetch_disable_network.html.mock-http-headers
 data/link_rel_prefetch_referrer_policy.html
 data/lite_js_test.mojom
-data/loader/blank.html
 data/loader/async_resource_handler.html
+data/loader/blank.html
 data/loader/change_title.js
 data/loader/cors_file_origin_test.html
 data/loader/cors_origin_access_list_test.html
diff --git a/content/test/data/accessibility/html/min-role-expected-blink.txt b/content/test/data/accessibility/html/min-role-expected-blink.txt
@@ -0,0 +1,15 @@
+rootWebArea
+++genericContainer ignored
+++++genericContainer ignored
+++++++group
+++++++++staticText name='Autofocus'
+++++++++++inlineTextBox name='Autofocus'
+++++++group
+++++++++staticText name='Draggable'
+++++++++++inlineTextBox name='Draggable'
+++++++genericContainer name='Tabindex=0'
+++++++++staticText name='Tabindex=0'
+++++++++++inlineTextBox name='Tabindex=0'
+++++++genericContainer
+++++++++staticText name='Tabindex=-1'
+++++++++++inlineTextBox name='Tabindex=-1'
diff --git a/content/test/data/accessibility/html/min-role.html b/content/test/data/accessibility/html/min-role.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<!-- Minimum role from https://github.com/w3c/html-aam/pull/454 -->
+<!-- autofocus gets a minimum role of group -->
+<div autofocus>Autofocus</div>
+<!-- draggable gets a minimum role of group -->
+<div draggable>Draggable</div>
+<!-- For now, tabindex does not have a minimum role. Consider having tabindex=0 using a minimum role of group -->
+<div tabindex="0">Tabindex=0</div>
+<div tabindex="-1">Tabindex=-1</div>
+<!-- popover targets also have a minimum role, tested in popover-api.html -->
+
diff --git a/third_party/blink/renderer/modules/accessibility/ax_node_object.cc b/third_party/blink/renderer/modules/accessibility/ax_node_object.cc
@@ -1919,9 +1919,11 @@ ax::mojom::blink::Role AXNodeObject::RoleFromLayoutObjectOrNode() const {
   }
 
   // Minimum role:
-  // TODO(aleventhal) Implement all of https://github.com/w3c/html-aam/pull/454.
   if (GetElement() && !GetElement()->FastHasAttribute(html_names::kRoleAttr)) {
-    if (IsPopup() != ax::mojom::blink::IsPopup::kNone) {
+    if (IsPopup() != ax::mojom::blink::IsPopup::kNone ||
+        GetElement()->FastHasAttribute(html_names::kAutofocusAttr) ||
+        GetElement()->FastHasAttribute(html_names::kDraggableAttr)) {
+      // TODO(accessibility) Consider for tabindex="0".
       return ax::mojom::blink::Role::kGroup;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1919,9 +1919,11 @@ ax::mojom::blink::Role AXNodeObject::RoleFromLayoutObjectOrNode() const {`
`1919`	`1919`	`}`
`1920`	`1920`
`1921`	`1921`	`// Minimum role:`
`1922`		`- // TODO(aleventhal) Implement all of https://github.com/w3c/html-aam/pull/454.`
`1923`	`1922`	`if (GetElement() && !GetElement()->FastHasAttribute(html_names::kRoleAttr)) {`
`1924`		`- if (IsPopup() != ax::mojom::blink::IsPopup::kNone) {`
	`1923`	`+ if (IsPopup() != ax::mojom::blink::IsPopup::kNone \|\|`
	`1924`	`+ GetElement()->FastHasAttribute(html_names::kAutofocusAttr) \|\|`
	`1925`	`+ GetElement()->FastHasAttribute(html_names::kDraggableAttr)) {`
	`1926`	`+ // TODO(accessibility) Consider for tabindex="0".`
`1925`	`1927`	`return ax::mojom::blink::Role::kGroup;`
`1926`	`1928`	`}`
`1927`	`1929`	`}`