AX: NSAccessibilityUIElementCountForSearchPredicateParameterizedAttri…

…bute is not used by any AT

https://bugs.webkit.org/show_bug.cgi?id=265004
rdar://118546456

Reviewed by Chris Fleizach.

This was added in https://bugs.webkit.org/show_bug.cgi?id=124561, but isn't by any assistive technology anymore.
This patch removes it.

There are some tests that use uiElementCountForSearchPredicate to count the number of objects of certain types,
and we probably want to keep these test conditions. So this patch reimplements this function in terms of AXUIElementsForSearchPredicate,
which is heavily used by VoiceOver, and just counts the results.

* LayoutTests/accessibility/mac/bounds-for-range-expected.txt:
* Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper ALLOW_DEPRECATED_IMPLEMENTATIONS_END]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
* Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::uiElementCountForSearchPredicate):
* Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):

Canonical link: https://commits.webkit.org/270872@main

LayoutTests/accessibility/mac/bounds-for-range-expected.txt

@@ -64,7 +64,6 @@ AXStyleTextMarkerRangeForTextMarker
 AXLengthForTextMarkerRange
 AXBoundsForRange
 AXStringForRange
-AXUIElementCountForSearchPredicate
 AXUIElementsForSearchPredicate
 AXEndTextMarkerForBounds
 AXStartTextMarkerForBounds

Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

@@ -235,10 +235,6 @@
 #endif
 
 
-#ifndef NSAccessibilityUIElementCountForSearchPredicateParameterizedAttribute
-#define NSAccessibilityUIElementCountForSearchPredicateParameterizedAttribute @"AXUIElementCountForSearchPredicate"
-#endif
-
 #ifndef NSAccessibilityUIElementsForSearchPredicateParameterizedAttribute
 #define NSAccessibilityUIElementsForSearchPredicateParameterizedAttribute @"AXUIElementsForSearchPredicate"
 #endif
@@ -2396,7 +2392,6 @@ - (NSArray *)accessibilityParameterizedAttributeNames
             AXLengthForTextMarkerRangeAttribute,
             NSAccessibilityBoundsForRangeParameterizedAttribute,
             NSAccessibilityStringForRangeParameterizedAttribute,
-            NSAccessibilityUIElementCountForSearchPredicateParameterizedAttribute,
             NSAccessibilityUIElementsForSearchPredicateParameterizedAttribute,
             AXEndTextMarkerForBoundsAttribute,
             AXStartTextMarkerForBoundsAttribute,
@@ -3105,25 +3100,6 @@ - (id)accessibilityAttributeValue:(NSString*)attribute forParameter:(id)paramete
         return createNSArray(operationResult).autorelease();
     }
 
-    if ([attribute isEqualToString:NSAccessibilityUIElementCountForSearchPredicateParameterizedAttribute]) {
-        AccessibilitySearchCriteria criteria = accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute(dictionary);
-        NSUInteger widgetChildrenSize = 0;
-        if (isMatchingPlugin(*backingObject, criteria)) {
-            // FIXME: We should also be searching the tree(s) resulting from `renderWidgetChildren` for matches.
-            // This is tracked by https://bugs.webkit.org/show_bug.cgi?id=230167.
-            if (auto* widgetChildren = [self renderWidgetChildren]) {
-                widgetChildrenSize = [widgetChildren count];
-                if (widgetChildrenSize >= criteria.resultsLimit)
-                    return @(std::min(widgetChildrenSize, NSUInteger(criteria.resultsLimit)));
-                criteria.resultsLimit -= widgetChildrenSize;
-            }
-        }
-
-        AccessibilityObject::AccessibilityChildrenVector results;
-        backingObject->findMatchingObjects(&criteria, results);
-        return @(results.size() + widgetChildrenSize);
-    }
-
     if ([attribute isEqualToString:NSAccessibilityUIElementsForSearchPredicateParameterizedAttribute]) {
         AccessibilitySearchCriteria criteria = accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute(dictionary);
         NSArray *widgetChildren = nil;

Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm

@@ -1123,9 +1123,9 @@ - (void)_accessibilitySetValue:(id)value forAttribute:(NSString*)attributeName;
 {
     BEGIN_AX_OBJC_EXCEPTIONS
     NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, UINT_MAX, searchKey, searchText, visibleOnly, immediateDescendantsOnly);
-    id value = [m_element accessibilityAttributeValue:@"AXUIElementCountForSearchPredicate" forParameter:parameterizedAttribute];
-    if ([value isKindOfClass:[NSNumber class]])
-        return [value unsignedIntValue];
+    id value = [m_element accessibilityAttributeValue:@"AXUIElementsForSearchPredicate" forParameter:parameterizedAttribute];
+    if ([value isKindOfClass:[NSArray class]])
+        return [value count];
     END_AX_OBJC_EXCEPTIONS
 
     return 0;

Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm

@@ -1298,9 +1298,9 @@ void setAttributeValue(id element, NSString* attribute, id value, bool synchrono
 {
     BEGIN_AX_OBJC_EXCEPTIONS
     NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, UINT_MAX, searchKey, searchText, visibleOnly, immediateDescendantsOnly);
-    auto value = attributeValueForParameter(@"AXUIElementCountForSearchPredicate", parameterizedAttribute);
-    if ([value isKindOfClass:[NSNumber class]])
-        return [value unsignedIntValue];
+    auto value = attributeValueForParameter(@"AXUIElementsForSearchPredicate", parameterizedAttribute);
+    if ([value isKindOfClass:[NSArray class]])
+        return [value count];
     END_AX_OBJC_EXCEPTIONS
 
     return 0;