Changeset 256631 in webkit

Timestamp:

Feb 14, 2020 11:29:34 AM (4 years ago)

Author:

Andres Gonzalez

Message:

Implementation of AXIsolatedObject::isDescendantOfObject.
​https://bugs.webkit.org/show_bug.cgi?id=207697

Reviewed by Chris Fleizach.

• Moved the implementation of AccessibilityObject::isDescendantOfObject

and isAncestorOfObject to the base class AXCoreObject.

• Implemented AXIsolatedObject::hasChildren by caching the value from

the associated AXObject. It is used in isDescendantOfObject.

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::isDescendantOfObject const): MOved to AXCoreObject.
(WebCore::AccessibilityObject::isAncestorOfObject const): Moved to AXCoreObject.

• accessibility/AccessibilityObject.h:
• accessibility/AccessibilityObjectInterface.h:

(WebCore::AXCoreObject::isDescendantOfObject const):
(WebCore::AXCoreObject::isAncestorOfObject const):

• accessibility/isolatedtree/AXIsolatedObject.cpp:

(WebCore::AXIsolatedObject::initializeAttributeData): Sets the HasChildren attribute.
(WebCore::AXIsolatedObject::hasChildren const): Deleted.
(WebCore::AXIsolatedObject::isDescendantOfObject const): Deleted.
(WebCore::AXIsolatedObject::isAncestorOfObject const): Deleted.

• accessibility/isolatedtree/AXIsolatedObject.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityObject.cpp (modified) (1 diff)
• accessibility/AccessibilityObject.h (modified) (1 diff)
• accessibility/AccessibilityObjectInterface.h (modified) (2 diffs)
• accessibility/isolatedtree/AXIsolatedObject.cpp (modified) (3 diffs)
• accessibility/isolatedtree/AXIsolatedObject.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-14  Andres Gonzalez  <andresg_22@apple.com>
+
+        Implementation of AXIsolatedObject::isDescendantOfObject.
+        https://bugs.webkit.org/show_bug.cgi?id=207697
+
+        Reviewed by Chris Fleizach.
+
+        - Moved the implementation of AccessibilityObject::isDescendantOfObject
+        and isAncestorOfObject to the base class AXCoreObject.
+        - Implemented AXIsolatedObject::hasChildren by caching the value from
+        the associated AXObject. It is used in isDescendantOfObject.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::isDescendantOfObject const): MOved to AXCoreObject.
+        (WebCore::AccessibilityObject::isAncestorOfObject const): Moved to AXCoreObject.
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityObjectInterface.h:
+        (WebCore::AXCoreObject::isDescendantOfObject const):
+        (WebCore::AXCoreObject::isAncestorOfObject const):
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::initializeAttributeData): Sets the HasChildren attribute.
+        (WebCore::AXIsolatedObject::hasChildren const): Deleted.
+        (WebCore::AXIsolatedObject::isDescendantOfObject const): Deleted.
+        (WebCore::AXIsolatedObject::isAncestorOfObject const): Deleted.
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+
 2020-02-14  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -2115 +2115 @@
     return AccessibilityOrientation::Undefined;
 }    
-
-bool AccessibilityObject::isDescendantOfObject(const AXCoreObject* axObject) const
-{
-    if (!axObject || !axObject->hasChildren())
-        return false;
-
-    return Accessibility::findAncestor<AccessibilityObject>(*this, false, [axObject] (const AccessibilityObject& object) {
-        return &object == axObject;
-    }) != nullptr;
-}
-
-bool AccessibilityObject::isAncestorOfObject(const AXCoreObject* axObject) const
-{
-    if (!axObject)
-        return false;
-
-    return this == axObject || axObject->isDescendantOfObject(this);
-}
 
 AccessibilityObject* AccessibilityObject::firstAnonymousBlockChild() const

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -485 +485 @@
     void handleActiveDescendantChanged() override { }
     void handleAriaExpandedChanged() override { }
-    bool isDescendantOfObject(const AXCoreObject*) const override;
-    bool isAncestorOfObject(const AXCoreObject*) const override;
     AccessibilityObject* firstAnonymousBlockChild() const override;
 

trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h

@@ -889 +889 @@
     virtual void handleActiveDescendantChanged() = 0;
     virtual void handleAriaExpandedChanged() = 0;
-    virtual bool isDescendantOfObject(const AXCoreObject*) const = 0;
-    virtual bool isAncestorOfObject(const AXCoreObject*) const = 0;
+    bool isDescendantOfObject(const AXCoreObject*) const;
+    bool isAncestorOfObject(const AXCoreObject*) const;
     virtual AXCoreObject* firstAnonymousBlockChild() const = 0;
 
@@ -1223 +1223 @@
 } // namespace Accessibility
 
+inline bool AXCoreObject::isDescendantOfObject(const AXCoreObject* axObject) const
+{
+    return axObject && axObject->hasChildren()
+        && Accessibility::findAncestor<AXCoreObject>(*this, false, [axObject] (const AXCoreObject& object) {
+            return &object == axObject;
+        }) != nullptr;
+}
+
+inline bool AXCoreObject::isAncestorOfObject(const AXCoreObject* axObject) const
+{
+    return axObject && (this == axObject || axObject->isDescendantOfObject(this));
+}
+
 } // namespace WebCore

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp

@@ -156 +156 @@
     setProperty(AXPropertyName::EstimatedLoadingProgress, object.estimatedLoadingProgress());
     setProperty(AXPropertyName::SupportsARIAOwns, object.supportsARIAOwns());
+    setProperty(AXPropertyName::HasChildren, object.hasChildren());
     setProperty(AXPropertyName::HasPopup, object.hasPopup());
     setProperty(AXPropertyName::PopupValue, object.popupValue());
@@ -1574 +1575 @@
 }
 
-bool AXIsolatedObject::hasChildren() const
-{
-    ASSERT_NOT_REACHED();
-    return false;
-}
-
 void AXIsolatedObject::setNeedsToUpdateChildren()
 {
@@ -1623 +1618 @@
 }
 
-bool AXIsolatedObject::isDescendantOfObject(const AXCoreObject*) const
-{
-    ASSERT_NOT_REACHED();
-    return false;
-}
-
-bool AXIsolatedObject::isAncestorOfObject(const AXCoreObject*) const
-{
-    ASSERT_NOT_REACHED();
-    return false;
-}
-
 AXCoreObject* AXIsolatedObject::firstAnonymousBlockChild() const
 {

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h

@@ -133 +133 @@
         FocusableAncestor,
         HasARIAValueNow,
+        HasChildren,
         HasPopup,
         HeadingLevel,
@@ -772 +773 @@
     bool shouldIgnoreAttributeRole() const override;
     bool canHaveChildren() const override;
-    bool hasChildren() const override;
+    bool hasChildren() const override { return boolAttributeValue(AXPropertyName::HasChildren); }
     void setNeedsToUpdateChildren() override;
     void setNeedsToUpdateSubtree() override;
@@ -782 +783 @@
     void handleActiveDescendantChanged() override;
     void handleAriaExpandedChanged() override;
-    bool isDescendantOfObject(const AXCoreObject*) const override;
-    bool isAncestorOfObject(const AXCoreObject*) const override;
     AXCoreObject* firstAnonymousBlockChild() const override;
     bool hasAttribute(const QualifiedName&) const override;