AX: aria-selected-menu-items test is flaky in ITM mode

https://bugs.webkit.org/show_bug.cgi?id=260278 rdar://113979223 Reviewed by Chris Fleizach. This change fixes aria-selected-menu-items in isolated tree mode by adding a traversal up for the newly selected child so that its ancestor also updates its SelectedChildren property. The traversal happens during a new case in AXObjectCache::updateIsolatedTree where the notification AXMenuListItemSelected is now handled. * LayoutTests/accessibility-isolated-tree/TestExpectations * LayoutTests/accessibility/aria-selected-menu-items.html * LayoutTests/platform/mac/accessibility/aria-selected-menu-items-expected.txt * LayoutTests/platform/glib/accessibility/aria-selected-menu-items-expected.txt Tests updated to be async for ITM. * Source/WebCore/accessibility/AXObjectCache.cpp (WebCore::AXObjectCache::updateIsolatedTree): Logic to handle AXMenuListItemSelected notifications. * Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp Handle AXPropertyName::SelectedChildren in updateNodeProperties. Canonical link: https://commits.webkit.org/267221@main
WebKit · Aug 24, 2023 · 5e54c0b · 5e54c0b
1 parent 51e8e5e
commit 5e54c0b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 20 deletions.
diff --git a/LayoutTests/accessibility-isolated-tree/TestExpectations b/LayoutTests/accessibility-isolated-tree/TestExpectations
@@ -49,6 +49,5 @@ accessibility/mac/grid-selected-cells.html [ Failure ]
 accessibility/table-cells.html [ Failure ]
 accessibility/mac/document-links.html [ Failure ]
 
-accessibility/aria-selected-menu-items.html [ Failure ]
 accessibility/aria-owns-hierarchy-remap.html [ Failure ]
 accessibility/element-reflection-ariaactivedescendant.html [ Failure ]
diff --git a/LayoutTests/accessibility/aria-selected-menu-items.html b/LayoutTests/accessibility/aria-selected-menu-items.html
@@ -30,37 +30,40 @@
 </div>
 
 <script>
-description("This tests that focused/active menu items are reported as selected children of the parent container.");
+testOutput = "This tests that focused/active menu items are reported as selected children of the parent container.\n";
 
 if (window.accessibilityController) {
     window.jsTestIsAsync = true;
 
     document.getElementById("item2").focus();
     setTimeout(async () => {
         await focus("item2");
-        selectedChildInfo(window.accessibilityController.accessibleElementById("menu1"));
-        selectedChildInfo(window.accessibilityController.accessibleElementById("menu2"));
+        testOutput += await selectedChildInfo(accessibilityController.accessibleElementById("menu1"), "item2");
+        testOutput += await selectedChildInfo(accessibilityController.accessibleElementById("menu2"), "item5");
         await focus("item8");
-        selectedChildInfo(window.accessibilityController.accessibleElementById("menubar1"));
-        selectedChildInfo(window.accessibilityController.accessibleElementById("menubar2"));
+        testOutput += await selectedChildInfo(accessibilityController.accessibleElementById("menubar1"), "item8");
+        testOutput += await selectedChildInfo(accessibilityController.accessibleElementById("menubar2"), "item12");
         document.getElementById("content").style.visibility = "hidden";
 
+        debug(testOutput);
         finishJSTest();
     }, 0);
 }
 
-function selectedChildInfo(axElement) {
+async function selectedChildInfo(axElement, expectedChildId) {
+    result = ""
     if (!axElement)
-        debug("Element not exposed");
+        result += "Element not exposed";
 
     var count = axElement.selectedChildrenCount;
-    debug(platformValueForW3CName(axElement) + " has " + count + " selected child(ren)");
+    result += `${platformValueForW3CName(axElement)} has ${count} selected child(ren)\n`;
     for (var i = 0; i < count; i++) {
+        await waitFor(() => axElement.selectedChildAtIndex(i).domIdentifier == expectedChildId)
         var child = axElement.selectedChildAtIndex(i);
-        result = "\t" + platformValueForW3CName(child) + " (" + child.role + ")";
-        result += " isSelectable: " + child.isSelectable + " isSelected: " + child.isSelected;
-        debug(result);
+        result += `\t${platformValueForW3CName(child)} (${child.role})`;
+        result += ` isSelectable: ${child.isSelectable} isSelected: ${child.isSelected}\n`;
     }
+    return result;
 }
 
 async function focus(id) {

diff --git a/LayoutTests/platform/glib/accessibility/aria-selected-menu-items-expected.txt b/LayoutTests/platform/glib/accessibility/aria-selected-menu-items-expected.txt
@@ -1,8 +1,4 @@
 This tests that focused/active menu items are reported as selected children of the parent container.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
 First menu has 1 selected child(ren)
 	item 2 (AXRole: AXMenuItem) isSelectable: true isSelected: true
 Second menu has 1 selected child(ren)
@@ -11,6 +7,7 @@ First menubar has 1 selected child(ren)
 	Edit (AXRole: AXMenuItem) isSelectable: true isSelected: true
 Second menubar has 1 selected child(ren)
 	View (AXRole: AXMenuItem) isSelectable: true isSelected: true
+
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/LayoutTests/platform/mac/accessibility/aria-selected-menu-items-expected.txt b/LayoutTests/platform/mac/accessibility/aria-selected-menu-items-expected.txt
@@ -1,8 +1,4 @@
 This tests that focused/active menu items are reported as selected children of the parent container.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
 First menu has 1 selected child(ren)
 	item 2 (AXRole: AXMenuItem) isSelectable: true isSelected: true
 Second menu has 1 selected child(ren)
@@ -11,6 +7,7 @@ First menubar has 1 selected child(ren)
 	Edit (AXRole: AXMenuItem) isSelectable: true isSelected: true
 Second menubar has 1 selected child(ren)
 	View (AXRole: AXMenuItem) isSelectable: true isSelected: true
+
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/Source/WebCore/accessibility/AXObjectCache.cpp b/Source/WebCore/accessibility/AXObjectCache.cpp
@@ -4031,6 +4031,16 @@ void AXObjectCache::updateIsolatedTree(const Vector<std::pair<RefPtr<Accessibili
         case AXMaximumValueChanged:
             tree->updateNodeProperties(*notification.first, { AXPropertyName::MaxValueForRange, AXPropertyName::ValueForRange });
             break;
+        case AXMenuListItemSelected: {
+            RefPtr ancestor = Accessibility::findAncestor<AccessibilityObject>(*notification.first, false, [] (const auto& object) {
+                return object.isMenu() || object.isMenuBar();
+            });
+            if (ancestor) {
+                tree->updateNodeProperty(*ancestor, AXPropertyName::SelectedChildren);
+                tree->updateNodeProperty(*notification.first, AXPropertyName::IsSelected);
+            }
+            break;
+        }
         case AXMinimumValueChanged:
             tree->updateNodeProperties(*notification.first, { AXPropertyName::MinValueForRange, AXPropertyName::ValueForRange });
             break;

diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp b/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
@@ -574,6 +574,9 @@ void AXIsolatedTree::updateNodeProperties(AXCoreObject& axObject, const Vector<A
             propertyMap.set(AXPropertyName::SupportsKeyShortcuts, axObject.supportsKeyShortcuts());
             propertyMap.set(AXPropertyName::KeyShortcuts, axObject.keyShortcuts().isolatedCopy());
             break;
+        case AXPropertyName::SelectedChildren:
+            propertyMap.set(AXPropertyName::SelectedChildren, axIDs(axObject.selectedChildren()));
+            break;
         case AXPropertyName::SupportsPosInSet:
             propertyMap.set(AXPropertyName::SupportsPosInSet, axObject.supportsPosInSet());
             break;