Rename AXIsolatedTreeNode to AXIsolatedObject for consistency with AXCoreObject and...
authorandresg_22@apple.com <andresg_22@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Nov 2019 14:15:45 +0000 (14:15 +0000)
committerandresg_22@apple.com <andresg_22@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Nov 2019 14:15:45 +0000 (14:15 +0000)
https://bugs.webkit.org/show_bug.cgi?id=203913

Reviewed by Chris Fleizach.

No new tests needed, no new functionality.

- Renamed AXIsolatedTreeNode as AXIsolatedObject.
- This makes the naming consistent with AXCoreObject and AccessibilityObject.
- Some code cleanup in WebAccessibilityObjectWrapperBase.h.

* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::createIsolatedAccessibilityTreeHierarchy):
(WebCore::AXObjectCache::generateIsolatedAccessibilityTree):
* accessibility/AXObjectCache.h:
* accessibility/isolatedtree/AXIsolatedTree.cpp:
(WebCore::AXIsolatedTree::nodeInTreeForID):
(WebCore::AXIsolatedTree::nodeForID const):
(WebCore::AXIsolatedTree::focusedUIElement):
(WebCore::AXIsolatedTree::rootNode):
(WebCore::AXIsolatedTree::setRoot):
(WebCore::AXIsolatedTree::appendNodeChanges):
(WebCore::AXIsolatedTree::applyPendingChanges):
* accessibility/isolatedtree/AXIsolatedTree.h:
* accessibility/isolatedtree/AXIsolatedTreeNode.cpp:
(WebCore::AXIsolatedObject::AXIsolatedObject):
(WebCore::AXIsolatedObject::create):
(WebCore::AXIsolatedObject::initializeAttributeData):
(WebCore::AXIsolatedObject::setProperty):
(WebCore::AXIsolatedObject::appendChild):
(WebCore::AXIsolatedObject::setParent):
(WebCore::AXIsolatedObject::setTreeIdentifier):
(WebCore::AXIsolatedObject::children):
(WebCore::AXIsolatedObject::focusedUIElement const):
(WebCore::AXIsolatedObject::parentObjectUnignored const):
(WebCore::AXIsolatedObject::accessibilityHitTest const):
(WebCore::AXIsolatedObject::tree const):
(WebCore::AXIsolatedObject::rectAttributeValue const):
(WebCore::AXIsolatedObject::doubleAttributeValue const):
(WebCore::AXIsolatedObject::unsignedAttributeValue const):
(WebCore::AXIsolatedObject::boolAttributeValue const):
(WebCore::AXIsolatedObject::stringAttributeValue const):
(WebCore::AXIsolatedObject::intAttributeValue const):
(WebCore::AXIsolatedObject::updateBackingStore):
(WebCore::AXIsolatedTreeNode::AXIsolatedTreeNode): Deleted.
(WebCore::AXIsolatedTreeNode::create): Deleted.
(WebCore::AXIsolatedTreeNode::initializeAttributeData): Deleted.
(WebCore::AXIsolatedTreeNode::setProperty): Deleted.
(WebCore::AXIsolatedTreeNode::appendChild): Deleted.
(WebCore::AXIsolatedTreeNode::setParent): Deleted.
(WebCore::AXIsolatedTreeNode::setTreeIdentifier): Deleted.
(WebCore::AXIsolatedTreeNode::children): Deleted.
(WebCore::AXIsolatedTreeNode::focusedUIElement const): Deleted.
(WebCore::AXIsolatedTreeNode::parentObjectUnignored const): Deleted.
(WebCore::AXIsolatedTreeNode::accessibilityHitTest const): Deleted.
(WebCore::AXIsolatedTreeNode::tree const): Deleted.
(WebCore::AXIsolatedTreeNode::rectAttributeValue const): Deleted.
(WebCore::AXIsolatedTreeNode::doubleAttributeValue const): Deleted.
(WebCore::AXIsolatedTreeNode::unsignedAttributeValue const): Deleted.
(WebCore::AXIsolatedTreeNode::boolAttributeValue const): Deleted.
(WebCore::AXIsolatedTreeNode::stringAttributeValue const): Deleted.
(WebCore::AXIsolatedTreeNode::intAttributeValue const): Deleted.
(WebCore::AXIsolatedTreeNode::updateBackingStore): Deleted.
* accessibility/isolatedtree/AXIsolatedTreeNode.h:
* accessibility/mac/WebAccessibilityObjectWrapperBase.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252182 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/accessibility/AXObjectCache.cpp
Source/WebCore/accessibility/AXObjectCache.h
Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h
Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.cpp
Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.h
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h

index 8f5a4e8..57f6965 100644 (file)
@@ -1,5 +1,73 @@
 2019-11-07  Andres Gonzalez  <andresg_22@apple.com>
 
+        Rename AXIsolatedTreeNode to AXIsolatedObject for consistency with AXCoreObject and AccessibilityObject.
+        https://bugs.webkit.org/show_bug.cgi?id=203913
+
+        Reviewed by Chris Fleizach.
+
+        No new tests needed, no new functionality.
+
+        - Renamed AXIsolatedTreeNode as AXIsolatedObject.
+        - This makes the naming consistent with AXCoreObject and AccessibilityObject.
+        - Some code cleanup in WebAccessibilityObjectWrapperBase.h.
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::createIsolatedAccessibilityTreeHierarchy):
+        (WebCore::AXObjectCache::generateIsolatedAccessibilityTree):
+        * accessibility/AXObjectCache.h:
+        * accessibility/isolatedtree/AXIsolatedTree.cpp:
+        (WebCore::AXIsolatedTree::nodeInTreeForID):
+        (WebCore::AXIsolatedTree::nodeForID const):
+        (WebCore::AXIsolatedTree::focusedUIElement):
+        (WebCore::AXIsolatedTree::rootNode):
+        (WebCore::AXIsolatedTree::setRoot):
+        (WebCore::AXIsolatedTree::appendNodeChanges):
+        (WebCore::AXIsolatedTree::applyPendingChanges):
+        * accessibility/isolatedtree/AXIsolatedTree.h:
+        * accessibility/isolatedtree/AXIsolatedTreeNode.cpp:
+        (WebCore::AXIsolatedObject::AXIsolatedObject):
+        (WebCore::AXIsolatedObject::create):
+        (WebCore::AXIsolatedObject::initializeAttributeData):
+        (WebCore::AXIsolatedObject::setProperty):
+        (WebCore::AXIsolatedObject::appendChild):
+        (WebCore::AXIsolatedObject::setParent):
+        (WebCore::AXIsolatedObject::setTreeIdentifier):
+        (WebCore::AXIsolatedObject::children):
+        (WebCore::AXIsolatedObject::focusedUIElement const):
+        (WebCore::AXIsolatedObject::parentObjectUnignored const):
+        (WebCore::AXIsolatedObject::accessibilityHitTest const):
+        (WebCore::AXIsolatedObject::tree const):
+        (WebCore::AXIsolatedObject::rectAttributeValue const):
+        (WebCore::AXIsolatedObject::doubleAttributeValue const):
+        (WebCore::AXIsolatedObject::unsignedAttributeValue const):
+        (WebCore::AXIsolatedObject::boolAttributeValue const):
+        (WebCore::AXIsolatedObject::stringAttributeValue const):
+        (WebCore::AXIsolatedObject::intAttributeValue const):
+        (WebCore::AXIsolatedObject::updateBackingStore):
+        (WebCore::AXIsolatedTreeNode::AXIsolatedTreeNode): Deleted.
+        (WebCore::AXIsolatedTreeNode::create): Deleted.
+        (WebCore::AXIsolatedTreeNode::initializeAttributeData): Deleted.
+        (WebCore::AXIsolatedTreeNode::setProperty): Deleted.
+        (WebCore::AXIsolatedTreeNode::appendChild): Deleted.
+        (WebCore::AXIsolatedTreeNode::setParent): Deleted.
+        (WebCore::AXIsolatedTreeNode::setTreeIdentifier): Deleted.
+        (WebCore::AXIsolatedTreeNode::children): Deleted.
+        (WebCore::AXIsolatedTreeNode::focusedUIElement const): Deleted.
+        (WebCore::AXIsolatedTreeNode::parentObjectUnignored const): Deleted.
+        (WebCore::AXIsolatedTreeNode::accessibilityHitTest const): Deleted.
+        (WebCore::AXIsolatedTreeNode::tree const): Deleted.
+        (WebCore::AXIsolatedTreeNode::rectAttributeValue const): Deleted.
+        (WebCore::AXIsolatedTreeNode::doubleAttributeValue const): Deleted.
+        (WebCore::AXIsolatedTreeNode::unsignedAttributeValue const): Deleted.
+        (WebCore::AXIsolatedTreeNode::boolAttributeValue const): Deleted.
+        (WebCore::AXIsolatedTreeNode::stringAttributeValue const): Deleted.
+        (WebCore::AXIsolatedTreeNode::intAttributeValue const): Deleted.
+        (WebCore::AXIsolatedTreeNode::updateBackingStore): Deleted.
+        * accessibility/isolatedtree/AXIsolatedTreeNode.h:
+        * accessibility/mac/WebAccessibilityObjectWrapperBase.h:
+
+2019-11-07  Andres Gonzalez  <andresg_22@apple.com>
+
         Implement AXIsolatedTreeNode::roleDescription.
         https://bugs.webkit.org/show_bug.cgi?id=203863
         <rdar://problem/56934443>
index caa7034..4fec457 100644 (file)
@@ -2943,9 +2943,9 @@ void AXObjectCache::performDeferredCacheUpdate()
 }
     
 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-Ref<AXIsolatedTreeNode> AXObjectCache::createIsolatedAccessibilityTreeHierarchy(AXCoreObject& object, AXID parentID, AXIsolatedTree& tree, Vector<Ref<AXIsolatedTreeNode>>& nodeChanges)
+Ref<AXIsolatedObject> AXObjectCache::createIsolatedAccessibilityTreeHierarchy(AXCoreObject& object, AXID parentID, AXIsolatedTree& tree, Vector<Ref<AXIsolatedObject>>& nodeChanges)
 {
-    auto isolatedTreeNode = AXIsolatedTreeNode::create(object);
+    auto isolatedTreeNode = AXIsolatedObject::create(object);
     nodeChanges.append(isolatedTreeNode.copyRef());
 
     isolatedTreeNode->setTreeIdentifier(tree.treeIdentifier());
@@ -2968,7 +2968,7 @@ Ref<AXIsolatedTree> AXObjectCache::generateIsolatedAccessibilityTree()
     if (!tree)
         tree = AXIsolatedTree::createTreeForPageID(*m_document.pageID());
     
-    Vector<Ref<AXIsolatedTreeNode>> nodeChanges;
+    Vector<Ref<AXIsolatedObject>> nodeChanges;
     auto root = createIsolatedAccessibilityTreeHierarchy(*rootObject(), InvalidAXID, *tree, nodeChanges);
     tree->setRoot(root);
     tree->appendNodeChanges(nodeChanges);
index ac0c2bc..29bb250 100644 (file)
@@ -47,7 +47,7 @@
 namespace WebCore {
 
 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-class AXIsolatedTreeNode;
+class AXIsolatedObject;
 #endif
 class Document;
 class HTMLAreaElement;
@@ -194,7 +194,7 @@ public:
 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
     WEBCORE_EXPORT Ref<AXIsolatedTree> generateIsolatedAccessibilityTree();
 
-    Ref<AXIsolatedTreeNode> createIsolatedAccessibilityTreeHierarchy(AXCoreObject&, AXID, AXIsolatedTree&, Vector<Ref<AXIsolatedTreeNode>>&);
+    Ref<AXIsolatedObject> createIsolatedAccessibilityTreeHierarchy(AXCoreObject&, AXID, AXIsolatedTree&, Vector<Ref<AXIsolatedObject>>&);
 #endif
     
 #if ENABLE(ACCESSIBILITY)
index cff9707..07cbc2b 100644 (file)
@@ -67,7 +67,7 @@ Ref<AXIsolatedTree> AXIsolatedTree::create()
     return adoptRef(*new AXIsolatedTree());
 }
 
-RefPtr<AXIsolatedTreeNode> AXIsolatedTree::nodeInTreeForID(AXIsolatedTreeID treeID, AXID axID)
+RefPtr<AXIsolatedObject> AXIsolatedTree::nodeInTreeForID(AXIsolatedTreeID treeID, AXID axID)
 {
     return treeForID(treeID)->nodeForID(axID);
 }
@@ -97,24 +97,24 @@ RefPtr<AXIsolatedTree> AXIsolatedTree::treeForPageID(PageIdentifier pageID)
     return nullptr;
 }
 
-RefPtr<AXIsolatedTreeNode> AXIsolatedTree::nodeForID(AXID axID) const
+RefPtr<AXIsolatedObject> AXIsolatedTree::nodeForID(AXID axID) const
 {
     if (!axID)
         return nullptr;
     return m_readerThreadNodeMap.get(axID);
 }
 
-RefPtr<AXIsolatedTreeNode> AXIsolatedTree::focusedUIElement()
+RefPtr<AXIsolatedObject> AXIsolatedTree::focusedUIElement()
 {
     return nodeForID(m_focusedNodeID);
 }
     
-RefPtr<AXIsolatedTreeNode> AXIsolatedTree::rootNode()
+RefPtr<AXIsolatedObject> AXIsolatedTree::rootNode()
 {
     return nodeForID(m_rootNodeID);
 }
 
-void AXIsolatedTree::setRoot(Ref<AXIsolatedTreeNode>& root)
+void AXIsolatedTree::setRoot(Ref<AXIsolatedObject>& root)
 {
     LockHolder locker { m_changeLogLock };
     m_rootNodeID = root->objectID();
@@ -133,7 +133,7 @@ void AXIsolatedTree::removeNode(AXID axID)
     m_pendingRemovals.append(axID);
 }
 
-void AXIsolatedTree::appendNodeChanges(Vector<Ref<AXIsolatedTreeNode>>& log)
+void AXIsolatedTree::appendNodeChanges(Vector<Ref<AXIsolatedObject>>& log)
 {
     LockHolder locker { m_changeLogLock };
     for (auto& node : log)
@@ -144,7 +144,7 @@ void AXIsolatedTree::applyPendingChanges()
 {
     RELEASE_ASSERT(!isMainThread());
     LockHolder locker { m_changeLogLock };
-    Vector<Ref<AXIsolatedTreeNode>> appendCopy;
+    Vector<Ref<AXIsolatedObject>> appendCopy;
     std::swap(appendCopy, m_pendingAppends);
     Vector<AXID> removeCopy({ WTFMove(m_pendingRemovals) });
     locker.unlockEarly();
index daf33fc..307cd91 100644 (file)
@@ -48,16 +48,16 @@ public:
     WEBCORE_EXPORT static RefPtr<AXIsolatedTree> treeForPageID(PageIdentifier);
     WEBCORE_EXPORT static RefPtr<AXIsolatedTree> treeForID(AXIsolatedTreeID);
 
-    WEBCORE_EXPORT RefPtr<AXIsolatedTreeNode> rootNode();
-    WEBCORE_EXPORT RefPtr<AXIsolatedTreeNode> focusedUIElement();
-    RefPtr<AXIsolatedTreeNode> nodeForID(AXID) const;
-    static RefPtr<AXIsolatedTreeNode> nodeInTreeForID(AXIsolatedTreeID, AXID);
+    WEBCORE_EXPORT RefPtr<AXIsolatedObject> rootNode();
+    WEBCORE_EXPORT RefPtr<AXIsolatedObject> focusedUIElement();
+    RefPtr<AXIsolatedObject> nodeForID(AXID) const;
+    static RefPtr<AXIsolatedObject> nodeInTreeForID(AXIsolatedTreeID, AXID);
 
     // Call on main thread
-    void appendNodeChanges(Vector<Ref<AXIsolatedTreeNode>>&);
+    void appendNodeChanges(Vector<Ref<AXIsolatedObject>>&);
     void removeNode(AXID);
 
-    void setRoot(Ref<AXIsolatedTreeNode>&);
+    void setRoot(Ref<AXIsolatedObject>&);
     void setFocusedNodeID(AXID);
     
     // Call on AX thread
@@ -72,10 +72,10 @@ private:
     static HashMap<PageIdentifier, Ref<AXIsolatedTree>>& treePageCache();
 
     // Only access on AX thread requesting data.
-    HashMap<AXID, Ref<AXIsolatedTreeNode>> m_readerThreadNodeMap;
+    HashMap<AXID, Ref<AXIsolatedObject>> m_readerThreadNodeMap;
 
     // Written to by main thread under lock, accessed and applied by AX thread.
-    Vector<Ref<AXIsolatedTreeNode>> m_pendingAppends;
+    Vector<Ref<AXIsolatedObject>> m_pendingAppends;
     Vector<AXID> m_pendingRemovals;
     AXID m_pendingFocusedNodeID;
     Lock m_changeLogLock;
index 37cfae2..8b554f9 100644 (file)
@@ -34,7 +34,7 @@ extern "C" bool _AXUIElementRequestServicedBySecondaryAXThread(void);
 
 namespace WebCore {
 
-AXIsolatedTreeNode::AXIsolatedTreeNode(const AXCoreObject& object)
+AXIsolatedObject::AXIsolatedObject(const AXCoreObject& object)
     : m_id(object.objectID())
 {
     ASSERT(isMainThread());
@@ -44,14 +44,14 @@ AXIsolatedTreeNode::AXIsolatedTreeNode(const AXCoreObject& object)
 #endif
 }
 
-Ref<AXIsolatedTreeNode> AXIsolatedTreeNode::create(const AXCoreObject& object)
+Ref<AXIsolatedObject> AXIsolatedObject::create(const AXCoreObject& object)
 {
-    return adoptRef(*new AXIsolatedTreeNode(object));
+    return adoptRef(*new AXIsolatedObject(object));
 }
 
-AXIsolatedTreeNode::~AXIsolatedTreeNode() = default;
+AXIsolatedObject::~AXIsolatedObject() = default;
 
-void AXIsolatedTreeNode::initializeAttributeData(const AXCoreObject& object)
+void AXIsolatedObject::initializeAttributeData(const AXCoreObject& object)
 {
     setProperty(AXPropertyName::RoleValue, static_cast<int>(object.roleValue()));
     setProperty(AXPropertyName::RolePlatformString, object.rolePlatformString().isolatedCopy());
@@ -73,7 +73,7 @@ void AXIsolatedTreeNode::initializeAttributeData(const AXCoreObject& object)
     setProperty(AXPropertyName::HelpText, object.helpTextAttributeValue().isolatedCopy());
 }
 
-void AXIsolatedTreeNode::setProperty(AXPropertyName propertyName, AttributeValueVariant&& value, bool shouldRemove)
+void AXIsolatedObject::setProperty(AXPropertyName propertyName, AttributeValueVariant&& value, bool shouldRemove)
 {
     ASSERT(!m_initialized);
     ASSERT(isMainThread());
@@ -84,26 +84,26 @@ void AXIsolatedTreeNode::setProperty(AXPropertyName propertyName, AttributeValue
         m_attributeMap.set(propertyName, value);
 }
 
-void AXIsolatedTreeNode::appendChild(AXID axID)
+void AXIsolatedObject::appendChild(AXID axID)
 {
     ASSERT(isMainThread());
     m_childrenIDs.append(axID);
 }
 
-void AXIsolatedTreeNode::setParent(AXID parent)
+void AXIsolatedObject::setParent(AXID parent)
 {
     ASSERT(isMainThread());
     m_parent = parent;
 }
 
-void AXIsolatedTreeNode::setTreeIdentifier(AXIsolatedTreeID treeIdentifier)
+void AXIsolatedObject::setTreeIdentifier(AXIsolatedTreeID treeIdentifier)
 {
     m_treeIdentifier = treeIdentifier;
     if (auto tree = AXIsolatedTree::treeForID(m_treeIdentifier))
         m_cachedTree = tree;
 }
 
-const AXCoreObject::AccessibilityChildrenVector& AXIsolatedTreeNode::children(bool)
+const AXCoreObject::AccessibilityChildrenVector& AXIsolatedObject::children(bool)
 {
     if (_AXUIElementRequestServicedBySecondaryAXThread()) {
         m_children.clear();
@@ -115,19 +115,19 @@ const AXCoreObject::AccessibilityChildrenVector& AXIsolatedTreeNode::children(bo
     return m_children;
 }
 
-AXCoreObject* AXIsolatedTreeNode::focusedUIElement() const
+AXCoreObject* AXIsolatedObject::focusedUIElement() const
 {
     if (auto focusedElement = tree()->focusedUIElement())
         return focusedElement.get();
     return nullptr;
 }
     
-AXCoreObject* AXIsolatedTreeNode::parentObjectUnignored() const
+AXCoreObject* AXIsolatedObject::parentObjectUnignored() const
 {
     return tree()->nodeForID(parent()).get();
 }
 
-AXCoreObject* AXIsolatedTreeNode::accessibilityHitTest(const IntPoint& point) const
+AXCoreObject* AXIsolatedObject::accessibilityHitTest(const IntPoint& point) const
 {
     if (!relativeFrame().contains(point))
         return nullptr;
@@ -137,15 +137,15 @@ AXCoreObject* AXIsolatedTreeNode::accessibilityHitTest(const IntPoint& point) co
         if (child && child->relativeFrame().contains(point))
             return child->accessibilityHitTest(point);
     }
-    return const_cast<AXIsolatedTreeNode*>(this);
+    return const_cast<AXIsolatedObject*>(this);
 }
 
-AXIsolatedTree* AXIsolatedTreeNode::tree() const
+AXIsolatedTree* AXIsolatedObject::tree() const
 {
     return m_cachedTree.get();
 }
 
-FloatRect AXIsolatedTreeNode::rectAttributeValue(AXPropertyName propertyName) const
+FloatRect AXIsolatedObject::rectAttributeValue(AXPropertyName propertyName) const
 {
     auto value = m_attributeMap.get(propertyName);
     return WTF::switchOn(value,
@@ -158,7 +158,7 @@ FloatRect AXIsolatedTreeNode::rectAttributeValue(AXPropertyName propertyName) co
     );
 }
 
-double AXIsolatedTreeNode::doubleAttributeValue(AXPropertyName propertyName) const
+double AXIsolatedObject::doubleAttributeValue(AXPropertyName propertyName) const
 {
     auto value = m_attributeMap.get(propertyName);
     return WTF::switchOn(value,
@@ -167,7 +167,7 @@ double AXIsolatedTreeNode::doubleAttributeValue(AXPropertyName propertyName) con
     );
 }
 
-unsigned AXIsolatedTreeNode::unsignedAttributeValue(AXPropertyName propertyName) const
+unsigned AXIsolatedObject::unsignedAttributeValue(AXPropertyName propertyName) const
 {
     auto value = m_attributeMap.get(propertyName);
     return WTF::switchOn(value,
@@ -176,7 +176,7 @@ unsigned AXIsolatedTreeNode::unsignedAttributeValue(AXPropertyName propertyName)
     );
 }
 
-bool AXIsolatedTreeNode::boolAttributeValue(AXPropertyName propertyName) const
+bool AXIsolatedObject::boolAttributeValue(AXPropertyName propertyName) const
 {
     auto value = m_attributeMap.get(propertyName);
     return WTF::switchOn(value,
@@ -185,7 +185,7 @@ bool AXIsolatedTreeNode::boolAttributeValue(AXPropertyName propertyName) const
     );
 }
 
-const String AXIsolatedTreeNode::stringAttributeValue(AXPropertyName propertyName) const
+const String AXIsolatedObject::stringAttributeValue(AXPropertyName propertyName) const
 {
     auto value = m_attributeMap.get(propertyName);
     return WTF::switchOn(value,
@@ -194,7 +194,7 @@ const String AXIsolatedTreeNode::stringAttributeValue(AXPropertyName propertyNam
     );
 }
 
-int AXIsolatedTreeNode::intAttributeValue(AXPropertyName propertyName) const
+int AXIsolatedObject::intAttributeValue(AXPropertyName propertyName) const
 {
     auto value = m_attributeMap.get(propertyName);
     return WTF::switchOn(value,
@@ -203,7 +203,7 @@ int AXIsolatedTreeNode::intAttributeValue(AXPropertyName propertyName) const
     );
 }
 
-void AXIsolatedTreeNode::updateBackingStore()
+void AXIsolatedObject::updateBackingStore()
 {
     if (_AXUIElementRequestServicedBySecondaryAXThread()) {
         RELEASE_ASSERT(!isMainThread());
index 9a4a2ba..f9a76a5 100644 (file)
@@ -45,10 +45,10 @@ namespace WebCore {
 
 class AXIsolatedTree;
 
-class AXIsolatedTreeNode final : public AXCoreObject {
+class AXIsolatedObject final : public AXCoreObject {
 public:
-    static Ref<AXIsolatedTreeNode> create(const AXCoreObject&);
-    ~AXIsolatedTreeNode();
+    static Ref<AXIsolatedObject> create(const AXCoreObject&);
+    ~AXIsolatedObject();
 
     void setObjectID(AXID id) override { m_id = id; }
     AXID objectID() const override { return m_id; }
@@ -665,8 +665,8 @@ private:
     AXIsolatedTreeID treeIdentifier() const { return m_treeIdentifier; }
     AXIsolatedTree* tree() const;
 
-    AXIsolatedTreeNode() = default;
-    AXIsolatedTreeNode(const AXCoreObject&);
+    AXIsolatedObject() = default;
+    AXIsolatedObject(const AXCoreObject&);
     void initializeAttributeData(const AXCoreObject&);
 
     using AttributeValueVariant = Variant<std::nullptr_t, String, bool, int, unsigned, double, Optional<FloatRect>>;
index 05a44fe..b64d0e7 100644 (file)
 #ifndef WebAccessibilityObjectWrapperBase_h
 #define WebAccessibilityObjectWrapperBase_h
 
-#include "AXIsolatedTree.h"
-#include "AXIsolatedTreeNode.h"
-#include "AccessibilityObject.h"
+#include "AccessibilityObjectInterface.h"
 #include <CoreGraphics/CoreGraphics.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Variant.h>
 #include <wtf/WeakPtr.h>
 
 namespace WebCore {
-class AccessibilityObject;
-#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-class AXIsolatedTreeNode;
-#endif
 struct AccessibilitySearchCriteria;
 class IntRect;
 class FloatPoint;
@@ -57,11 +51,6 @@ class VisiblePosition;
 
 - (id)initWithAccessibilityObject:(WebCore::AXCoreObject*)axObject;
 
-#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-@property (nonatomic, readonly) RefPtr<WebCore::AXIsolatedTreeNode> isolatedTreeNode;
-@property (nonatomic, assign) WebCore::AXIsolatedTreeID isolatedTreeIdentifier;
-#endif
-
 - (void)detach;
 
 @property (nonatomic, assign) WebCore::AXID identifier;
@@ -69,7 +58,7 @@ class VisiblePosition;
 - (WebCore::AXCoreObject*)accessibilityObject;
 - (BOOL)updateObjectBackingStore;
 
-// This can be either an AccessibilityObject or an AXIsolatedTreeNode
+// This can be either an AccessibilityObject or an AXIsolatedObject
 - (WebCore::AXCoreObject*)axBackingObject;
 
 // These are pre-fixed with base so that AppKit does not end up calling into these directly (bypassing safety checks).
@@ -96,10 +85,7 @@ class VisiblePosition;
 
 extern WebCore::AccessibilitySearchCriteria accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute(const NSDictionary *);
 
-#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-extern NSArray *convertToNSArray(const Vector<RefPtr<WebCore::AXIsolatedTreeNode>>&);
-#endif
-extern NSArray *convertToNSArray(const WebCore::AccessibilityObject::AccessibilityChildrenVector&);
+extern NSArray *convertToNSArray(const WebCore::AXCoreObject::AccessibilityChildrenVector&);
 
 #if PLATFORM(IOS_FAMILY)
 - (id)_accessibilityWebDocumentView;