Changeset 284798 in webkit

Timestamp:

Oct 25, 2021, 11:04:45 AM (5 years ago)

Author:

Andres Gonzalez

Message:

Remove childrenInitialized() from the AXCoreObject interface.
​https://bugs.webkit.org/show_bug.cgi?id=232241
<rdar://problem/84613750>

Reviewed by Chris Fleizach.

Follow up to ​https://bugs.webkit.org/show_bug.cgi?id=232130

AXCoreObject::childrenInitialized is an internal housekeeping method to
the AccessibilityObject class hierarchy, thus it is unnecessary to
expose in the AXCoreObject interface.

• accessibility/AccessibilityObject.h:

(WebCore::AccessibilityObject::childrenInitialized const):

• accessibility/AccessibilityObjectInterface.h:

(WebCore::AXCoreObject::isDescendantOfObject const): No need to check
for childrenInitialized in this function.

• accessibility/isolatedtree/AXIsolatedObject.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-25  Andres Gonzalez  <andresg_22@apple.com>
+
+        Remove childrenInitialized() from the AXCoreObject interface.
+        https://bugs.webkit.org/show_bug.cgi?id=232241
+        <rdar://problem/84613750>
+
+        Reviewed by Chris Fleizach.
+
+        Follow up to https://bugs.webkit.org/show_bug.cgi?id=232130
+
+        AXCoreObject::childrenInitialized is an internal housekeeping method to
+        the AccessibilityObject class hierarchy, thus it is unnecessary to
+        expose in the AXCoreObject interface.
+
+        * accessibility/AccessibilityObject.h:
+        (WebCore::AccessibilityObject::childrenInitialized const):
+        * accessibility/AccessibilityObjectInterface.h:
+        (WebCore::AXCoreObject::isDescendantOfObject const): No need to check
+        for childrenInitialized in this function.
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+
 2021-10-25  Tyler Wilcock  <tyler_w@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -496 +496 @@
 
     bool canHaveChildren() const override { return true; }
-    bool childrenInitialized() const override { return m_childrenInitialized; }
     void updateChildrenIfNecessary() override;
     void setNeedsToUpdateChildren() override { }
@@ -811 +810 @@
     AXID m_id { 0 };
 protected: // FIXME: Make the data members private.
+    bool childrenInitialized() const { return m_childrenInitialized; }
     AccessibilityChildrenVector m_children;
     mutable bool m_childrenInitialized { false };

trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h

@@ -1250 +1250 @@
 
     virtual bool canHaveChildren() const = 0;
-    virtual bool childrenInitialized() const = 0;
     virtual void updateChildrenIfNecessary() = 0;
     virtual void setNeedsToUpdateChildren() = 0;
@@ -1626 +1625 @@
 inline bool AXCoreObject::isDescendantOfObject(const AXCoreObject* axObject) const
 {
-    return axObject && axObject->childrenInitialized()
-        && Accessibility::findAncestor<AXCoreObject>(*this, false, [axObject] (const AXCoreObject& object) {
+    return axObject && Accessibility::findAncestor<AXCoreObject>(*this, false, [axObject] (const AXCoreObject& object) {
             return &object == axObject;
         }) != nullptr;

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

@@ -611 +611 @@
     void insertChild(AXCoreObject*, unsigned, DescendIfIgnored = DescendIfIgnored::Yes) override;
     bool canHaveChildren() const override;
-    bool childrenInitialized() const override { return true; }
     void setNeedsToUpdateChildren() override;
     void setNeedsToUpdateSubtree() override;