AX: AXIsActiveDescendantOfFocusedContainer is exposed by the Accessib…

…ilityObjectWrapperMac but not used https://bugs.webkit.org/show_bug.cgi?id=244423 rdar://problem/99216969 Reviewed by Chris Fleizach. Un-exposing this from the wrapper allows us to remove AXPropertyName::IsActiveDescendantOfFocusedContainer. The function definition is now also moved from AXCoreObject to AccessibilityObject. * Source/WebCore/accessibility/AccessibilityObject.cpp: (WebCore::AccessibilityObject::selectedListItem): * Source/WebCore/accessibility/AccessibilityObject.h: * Source/WebCore/accessibility/AccessibilityObjectInterface.h: * Source/WebCore/accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::ariaSelectedRows): (WebCore::AccessibilityRenderObject::ariaListboxSelectedChildren): * Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp: (WebCore::AXIsolatedObject::initializeProperties): (WebCore::AXIsolatedObject::selectedListItem): Deleted. * Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h: * Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h: * Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm: (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]): * Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp Use the AccessibilityObject-cast object since isActiveDescendantOfFocusedContainer is no longer a core method (because Mac doesn't need it, and ATSPI doesn't seem to have an isolated object implementation). Canonical link: https://commits.webkit.org/253874@main
WebKit · Aug 28, 2022 · 94ae1c1 · 94ae1c1
1 parent 3f8075f
commit 94ae1c1
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 26 deletions.
diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -3961,11 +3961,18 @@ bool AccessibilityObject::isContainedByPasswordField() const
     return is<HTMLInputElement>(element) && downcast<HTMLInputElement>(*element).isPasswordField();
 }
 
-AXCoreObject* AccessibilityObject::selectedListItem()
+AccessibilityObject* AccessibilityObject::selectedListItem()
 {
     for (const auto& child : children()) {
-        if (child->isListItem() && (child->isSelected() || child->isActiveDescendantOfFocusedContainer()))
-            return child.get();
+        if (!child->isListItem())
+            continue;
+
+        auto* axObject = dynamicDowncast<AccessibilityObject>(child.get());
+        if (!axObject)
+            continue;
+
+        if (axObject->isSelected() || axObject->isActiveDescendantOfFocusedContainer())
+            return axObject;
     }
 
     return nullptr;

diff --git a/Source/WebCore/accessibility/AccessibilityObject.h b/Source/WebCore/accessibility/AccessibilityObject.h
@@ -299,15 +299,15 @@ class AccessibilityObject : public AXCoreObject, public CanMakeWeakPtr<Accessibi
     float stepValueForRange() const override { return 0.0f; }
     AXCoreObject* selectedRadioButton() override { return nullptr; }
     AXCoreObject* selectedTabItem() override { return nullptr; }
-    AXCoreObject* selectedListItem() override;
+    AccessibilityObject* selectedListItem();
     int layoutCount() const override { return 0; }
     double loadingProgress() const override { return 0; }
     WEBCORE_EXPORT static bool isARIAControl(AccessibilityRole);
     bool supportsCheckedState() const override;
 
     bool supportsARIARoleDescription() const;
     bool supportsARIAOwns() const override { return false; }
-    bool isActiveDescendantOfFocusedContainer() const override;
+    bool isActiveDescendantOfFocusedContainer() const;
 
     bool hasPopup() const override { return false; }
     String popupValue() const override;

diff --git a/Source/WebCore/accessibility/AccessibilityObjectInterface.h b/Source/WebCore/accessibility/AccessibilityObjectInterface.h
@@ -1068,7 +1068,6 @@ class AXCoreObject : public ThreadSafeRefCounted<AXCoreObject> {
     virtual float stepValueForRange() const = 0;
     virtual AXCoreObject* selectedRadioButton() = 0;
     virtual AXCoreObject* selectedTabItem() = 0;
-    virtual AXCoreObject* selectedListItem() = 0;
     virtual int layoutCount() const = 0;
     virtual double loadingProgress() const = 0;
     virtual String brailleLabel() const = 0;
@@ -1078,7 +1077,6 @@ class AXCoreObject : public ThreadSafeRefCounted<AXCoreObject> {
     virtual String extendedDescription() const = 0;
 
     virtual bool supportsARIAOwns() const = 0;
-    virtual bool isActiveDescendantOfFocusedContainer() const = 0;
 
     // Retrieval of related objects.
     AccessibilityChildrenVector activeDescendantOfObjects() const { return relatedObjects(AXRelationType::ActiveDescendantOf); }

diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -3272,7 +3272,11 @@ void AccessibilityRenderObject::ariaSelectedRows(AccessibilityChildrenVector& re
 
     // Get all the rows.
     auto rowsIteration = [&](const auto& rows) {
-        for (auto& row : rows) {
+        for (auto& rowCoreObject : rows) {
+            auto* row = dynamicDowncast<AccessibilityObject>(rowCoreObject.get());
+            if (!row)
+                continue;
+
             if (row->isSelected() || row->isActiveDescendantOfFocusedContainer()) {
                 result.append(row);
                 if (!isMulti)
@@ -3297,10 +3301,13 @@ void AccessibilityRenderObject::ariaListboxSelectedChildren(AccessibilityChildre
 
     for (const auto& child : children()) {
         // Every child should have aria-role option, and if so, check for selected attribute/state.
-        if (child->ariaRoleAttribute() == AccessibilityRole::ListBoxOption && (child->isSelected() || child->isActiveDescendantOfFocusedContainer())) {
-            result.append(child);
-            if (!isMulti)
-                return;
+        if (child->ariaRoleAttribute() == AccessibilityRole::ListBoxOption) {
+            auto* childAxObject = dynamicDowncast<AccessibilityObject>(child.get());
+            if (childAxObject->isSelected() || childAxObject->isActiveDescendantOfFocusedContainer()) {
+                result.append(childAxObject);
+                if (!isMulti)
+                    return;
+            }
         }
     }
 }

diff --git a/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp b/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp
@@ -773,7 +773,7 @@ uint64_t AccessibilityObjectAtspi::state() const
 
     if (m_coreObject->isFocused() && !m_coreObject->activeDescendant())
         addState(Atspi::State::Focused);
-    else if (m_coreObject->isActiveDescendantOfFocusedContainer()) {
+    else if (liveObject->isActiveDescendantOfFocusedContainer()) {
         addState(Atspi::State::Focusable);
         addState(Atspi::State::Focused);
     }

diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp b/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp
@@ -86,7 +86,6 @@ void AXIsolatedObject::initializeProperties(Ref<AXCoreObject> coreObject, IsRoot
         setProperty(AXPropertyName::AncestorFlags, object.computeAncestorFlagsWithTraversal());
 
     setProperty(AXPropertyName::HasARIAValueNow, object.hasARIAValueNow());
-    setProperty(AXPropertyName::IsActiveDescendantOfFocusedContainer, object.isActiveDescendantOfFocusedContainer());
     setProperty(AXPropertyName::IsAttachment, object.isAttachment());
     setProperty(AXPropertyName::IsBusy, object.isBusy());
     setProperty(AXPropertyName::IsButton, object.isButton());
@@ -1855,12 +1854,6 @@ float AXIsolatedObject::stepValueForRange() const
     return 0;
 }
 
-AXCoreObject* AXIsolatedObject::selectedListItem()
-{
-    ASSERT_NOT_REACHED();
-    return nullptr;
-}
-
 bool AXIsolatedObject::hasDatalist() const
 {
     ASSERT_NOT_REACHED();

diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h b/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h
@@ -229,7 +229,6 @@ class AXIsolatedObject final : public AXCoreObject {
     int layoutCount() const override { return intAttributeValue(AXPropertyName::LayoutCount); }
     double loadingProgress() const override { return tree()->loadingProgress(); }
     bool supportsARIAOwns() const override { return boolAttributeValue(AXPropertyName::SupportsARIAOwns); }
-    bool isActiveDescendantOfFocusedContainer() const override { return boolAttributeValue(AXPropertyName::IsActiveDescendantOfFocusedContainer); }
     bool hasPopup() const override { return boolAttributeValue(AXPropertyName::HasPopup); }
     String popupValue() const override { return stringAttributeValue(AXPropertyName::PopupValue); }
     bool pressedIsPresent() const override { return boolAttributeValue(AXPropertyName::PressedIsPresent); }
@@ -542,7 +541,6 @@ class AXIsolatedObject final : public AXCoreObject {
     AccessibilityObjectInclusion defaultObjectInclusion() const override;
     bool accessibilityIsIgnoredByDefault() const override;
     float stepValueForRange() const override;
-    AXCoreObject* selectedListItem() override;
 
     AccessibilityChildrenVector relatedObjects(AXRelationType) const override;
 

diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h b/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h
@@ -128,7 +128,6 @@ enum class AXPropertyName : uint16_t {
     IncrementButton,
     InnerHTML,
     InvalidStatus,
-    IsActiveDescendantOfFocusedContainer,
     IsAnonymousMathOperator,
     IsGrabbed,
     IsARIATreeGridRow,

diff --git a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
@@ -2606,9 +2606,6 @@ - (id)accessibilityAttributeValue:(NSString*)attributeName
     if ([attributeName isEqualToString:@"AXReadOnlyValue"])
         return backingObject->readOnlyValue();
 
-    if ([attributeName isEqualToString:@"AXIsActiveDescendantOfFocusedContainer"])
-        return [NSNumber numberWithBool:backingObject->isActiveDescendantOfFocusedContainer()];
-
     if ([attributeName isEqualToString:AXHasDocumentRoleAncestorAttribute])
         return [NSNumber numberWithBool:backingObject->hasDocumentRoleAncestor()];