Changeset 252182 in webkit


Ignore:
Timestamp:
Nov 7, 2019 6:15:45 AM (4 years ago)
Author:
Andres Gonzalez
Message:

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:
Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r252181 r252182  
     12019-11-07  Andres Gonzalez  <andresg_22@apple.com>
     2
     3        Rename AXIsolatedTreeNode to AXIsolatedObject for consistency with AXCoreObject and AccessibilityObject.
     4        https://bugs.webkit.org/show_bug.cgi?id=203913
     5
     6        Reviewed by Chris Fleizach.
     7
     8        No new tests needed, no new functionality.
     9
     10        - Renamed AXIsolatedTreeNode as AXIsolatedObject.
     11        - This makes the naming consistent with AXCoreObject and AccessibilityObject.
     12        - Some code cleanup in WebAccessibilityObjectWrapperBase.h.
     13
     14        * accessibility/AXObjectCache.cpp:
     15        (WebCore::AXObjectCache::createIsolatedAccessibilityTreeHierarchy):
     16        (WebCore::AXObjectCache::generateIsolatedAccessibilityTree):
     17        * accessibility/AXObjectCache.h:
     18        * accessibility/isolatedtree/AXIsolatedTree.cpp:
     19        (WebCore::AXIsolatedTree::nodeInTreeForID):
     20        (WebCore::AXIsolatedTree::nodeForID const):
     21        (WebCore::AXIsolatedTree::focusedUIElement):
     22        (WebCore::AXIsolatedTree::rootNode):
     23        (WebCore::AXIsolatedTree::setRoot):
     24        (WebCore::AXIsolatedTree::appendNodeChanges):
     25        (WebCore::AXIsolatedTree::applyPendingChanges):
     26        * accessibility/isolatedtree/AXIsolatedTree.h:
     27        * accessibility/isolatedtree/AXIsolatedTreeNode.cpp:
     28        (WebCore::AXIsolatedObject::AXIsolatedObject):
     29        (WebCore::AXIsolatedObject::create):
     30        (WebCore::AXIsolatedObject::initializeAttributeData):
     31        (WebCore::AXIsolatedObject::setProperty):
     32        (WebCore::AXIsolatedObject::appendChild):
     33        (WebCore::AXIsolatedObject::setParent):
     34        (WebCore::AXIsolatedObject::setTreeIdentifier):
     35        (WebCore::AXIsolatedObject::children):
     36        (WebCore::AXIsolatedObject::focusedUIElement const):
     37        (WebCore::AXIsolatedObject::parentObjectUnignored const):
     38        (WebCore::AXIsolatedObject::accessibilityHitTest const):
     39        (WebCore::AXIsolatedObject::tree const):
     40        (WebCore::AXIsolatedObject::rectAttributeValue const):
     41        (WebCore::AXIsolatedObject::doubleAttributeValue const):
     42        (WebCore::AXIsolatedObject::unsignedAttributeValue const):
     43        (WebCore::AXIsolatedObject::boolAttributeValue const):
     44        (WebCore::AXIsolatedObject::stringAttributeValue const):
     45        (WebCore::AXIsolatedObject::intAttributeValue const):
     46        (WebCore::AXIsolatedObject::updateBackingStore):
     47        (WebCore::AXIsolatedTreeNode::AXIsolatedTreeNode): Deleted.
     48        (WebCore::AXIsolatedTreeNode::create): Deleted.
     49        (WebCore::AXIsolatedTreeNode::initializeAttributeData): Deleted.
     50        (WebCore::AXIsolatedTreeNode::setProperty): Deleted.
     51        (WebCore::AXIsolatedTreeNode::appendChild): Deleted.
     52        (WebCore::AXIsolatedTreeNode::setParent): Deleted.
     53        (WebCore::AXIsolatedTreeNode::setTreeIdentifier): Deleted.
     54        (WebCore::AXIsolatedTreeNode::children): Deleted.
     55        (WebCore::AXIsolatedTreeNode::focusedUIElement const): Deleted.
     56        (WebCore::AXIsolatedTreeNode::parentObjectUnignored const): Deleted.
     57        (WebCore::AXIsolatedTreeNode::accessibilityHitTest const): Deleted.
     58        (WebCore::AXIsolatedTreeNode::tree const): Deleted.
     59        (WebCore::AXIsolatedTreeNode::rectAttributeValue const): Deleted.
     60        (WebCore::AXIsolatedTreeNode::doubleAttributeValue const): Deleted.
     61        (WebCore::AXIsolatedTreeNode::unsignedAttributeValue const): Deleted.
     62        (WebCore::AXIsolatedTreeNode::boolAttributeValue const): Deleted.
     63        (WebCore::AXIsolatedTreeNode::stringAttributeValue const): Deleted.
     64        (WebCore::AXIsolatedTreeNode::intAttributeValue const): Deleted.
     65        (WebCore::AXIsolatedTreeNode::updateBackingStore): Deleted.
     66        * accessibility/isolatedtree/AXIsolatedTreeNode.h:
     67        * accessibility/mac/WebAccessibilityObjectWrapperBase.h:
     68
    1692019-11-07  Andres Gonzalez  <andresg_22@apple.com>
    270

  • trunk/Source/WebCore/accessibility/AXObjectCache.cpp

    r251974 r252182  
    29442944   
    29452945#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
    2946 Ref<AXIsolatedTreeNode> AXObjectCache::createIsolatedAccessibilityTreeHierarchy(AXCoreObject& object, AXID parentID, AXIsolatedTree& tree, Vector<Ref<AXIsolatedTreeNode>>& nodeChanges)
    2947 {
    2948     auto isolatedTreeNode = AXIsolatedTreeNode::create(object);
     2946Ref<AXIsolatedObject> AXObjectCache::createIsolatedAccessibilityTreeHierarchy(AXCoreObject& object, AXID parentID, AXIsolatedTree& tree, Vector<Ref<AXIsolatedObject>>& nodeChanges)
     2947{
     2948    auto isolatedTreeNode = AXIsolatedObject::create(object);
    29492949    nodeChanges.append(isolatedTreeNode.copyRef());
    29502950
    … …  
    29692969        tree = AXIsolatedTree::createTreeForPageID(*m_document.pageID());
    29702970   
    2971     Vector<Ref<AXIsolatedTreeNode>> nodeChanges;
     2971    Vector<Ref<AXIsolatedObject>> nodeChanges;
    29722972    auto root = createIsolatedAccessibilityTreeHierarchy(*rootObject(), InvalidAXID, *tree, nodeChanges);
    29732973    tree->setRoot(root);

  • trunk/Source/WebCore/accessibility/AXObjectCache.h

    r251974 r252182  
    4848
    4949#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
    50 class AXIsolatedTreeNode;
     50class AXIsolatedObject;
    5151#endif
    5252class Document;
    … …  
    195195    WEBCORE_EXPORT Ref<AXIsolatedTree> generateIsolatedAccessibilityTree();
    196196
    197     Ref<AXIsolatedTreeNode> createIsolatedAccessibilityTreeHierarchy(AXCoreObject&, AXID, AXIsolatedTree&, Vector<Ref<AXIsolatedTreeNode>>&);
     197    Ref<AXIsolatedObject> createIsolatedAccessibilityTreeHierarchy(AXCoreObject&, AXID, AXIsolatedTree&, Vector<Ref<AXIsolatedObject>>&);
    198198#endif
    199199   

  • trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp

    r251974 r252182  
    6868}
    6969
    70 RefPtr<AXIsolatedTreeNode> AXIsolatedTree::nodeInTreeForID(AXIsolatedTreeID treeID, AXID axID)
     70RefPtr<AXIsolatedObject> AXIsolatedTree::nodeInTreeForID(AXIsolatedTreeID treeID, AXID axID)
    7171{
    7272    return treeForID(treeID)->nodeForID(axID);
    … …  
    9898}
    9999
    100 RefPtr<AXIsolatedTreeNode> AXIsolatedTree::nodeForID(AXID axID) const
     100RefPtr<AXIsolatedObject> AXIsolatedTree::nodeForID(AXID axID) const
    101101{
    102102    if (!axID)
    … …  
    105105}
    106106
    107 RefPtr<AXIsolatedTreeNode> AXIsolatedTree::focusedUIElement()
     107RefPtr<AXIsolatedObject> AXIsolatedTree::focusedUIElement()
    108108{
    109109    return nodeForID(m_focusedNodeID);
    110110}
    111111   
    112 RefPtr<AXIsolatedTreeNode> AXIsolatedTree::rootNode()
     112RefPtr<AXIsolatedObject> AXIsolatedTree::rootNode()
    113113{
    114114    return nodeForID(m_rootNodeID);
    115115}
    116116
    117 void AXIsolatedTree::setRoot(Ref<AXIsolatedTreeNode>& root)
     117void AXIsolatedTree::setRoot(Ref<AXIsolatedObject>& root)
    118118{
    119119    LockHolder locker { m_changeLogLock };
    … …  
    134134}
    135135
    136 void AXIsolatedTree::appendNodeChanges(Vector<Ref<AXIsolatedTreeNode>>& log)
     136void AXIsolatedTree::appendNodeChanges(Vector<Ref<AXIsolatedObject>>& log)
    137137{
    138138    LockHolder locker { m_changeLogLock };
    … …  
    145145    RELEASE_ASSERT(!isMainThread());
    146146    LockHolder locker { m_changeLogLock };
    147     Vector<Ref<AXIsolatedTreeNode>> appendCopy;
     147    Vector<Ref<AXIsolatedObject>> appendCopy;
    148148    std::swap(appendCopy, m_pendingAppends);
    149149    Vector<AXID> removeCopy({ WTFMove(m_pendingRemovals) });

  • trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h

    r251974 r252182  
    4949    WEBCORE_EXPORT static RefPtr<AXIsolatedTree> treeForID(AXIsolatedTreeID);
    5050
    51     WEBCORE_EXPORT RefPtr<AXIsolatedTreeNode> rootNode();
    52     WEBCORE_EXPORT RefPtr<AXIsolatedTreeNode> focusedUIElement();
    53     RefPtr<AXIsolatedTreeNode> nodeForID(AXID) const;
    54     static RefPtr<AXIsolatedTreeNode> nodeInTreeForID(AXIsolatedTreeID, AXID);
     51    WEBCORE_EXPORT RefPtr<AXIsolatedObject> rootNode();
     52    WEBCORE_EXPORT RefPtr<AXIsolatedObject> focusedUIElement();
     53    RefPtr<AXIsolatedObject> nodeForID(AXID) const;
     54    static RefPtr<AXIsolatedObject> nodeInTreeForID(AXIsolatedTreeID, AXID);
    5555
    5656    // Call on main thread
    57     void appendNodeChanges(Vector<Ref<AXIsolatedTreeNode>>&);
     57    void appendNodeChanges(Vector<Ref<AXIsolatedObject>>&);
    5858    void removeNode(AXID);
    5959
    60     void setRoot(Ref<AXIsolatedTreeNode>&);
     60    void setRoot(Ref<AXIsolatedObject>&);
    6161    void setFocusedNodeID(AXID);
    6262   
    … …  
    7373
    7474    // Only access on AX thread requesting data.
    75     HashMap<AXID, Ref<AXIsolatedTreeNode>> m_readerThreadNodeMap;
     75    HashMap<AXID, Ref<AXIsolatedObject>> m_readerThreadNodeMap;
    7676
    7777    // Written to by main thread under lock, accessed and applied by AX thread.
    78     Vector<Ref<AXIsolatedTreeNode>> m_pendingAppends;
     78    Vector<Ref<AXIsolatedObject>> m_pendingAppends;
    7979    Vector<AXID> m_pendingRemovals;
    8080    AXID m_pendingFocusedNodeID;

  • trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.cpp

    r252181 r252182  
    3535namespace WebCore {
    3636
    37 AXIsolatedTreeNode::AXIsolatedTreeNode(const AXCoreObject& object)
     37AXIsolatedObject::AXIsolatedObject(const AXCoreObject& object)
    3838    : m_id(object.objectID())
    3939{
    … …  
    4545}
    4646
    47 Ref<AXIsolatedTreeNode> AXIsolatedTreeNode::create(const AXCoreObject& object)
    48 {
    49     return adoptRef(*new AXIsolatedTreeNode(object));
    50 }
    51 
    52 AXIsolatedTreeNode::~AXIsolatedTreeNode() = default;
    53 
    54 void AXIsolatedTreeNode::initializeAttributeData(const AXCoreObject& object)
     47Ref<AXIsolatedObject> AXIsolatedObject::create(const AXCoreObject& object)
     48{
     49    return adoptRef(*new AXIsolatedObject(object));
     50}
     51
     52AXIsolatedObject::~AXIsolatedObject() = default;
     53
     54void AXIsolatedObject::initializeAttributeData(const AXCoreObject& object)
    5555{
    5656    setProperty(AXPropertyName::RoleValue, static_cast<int>(object.roleValue()));
    … …  
    7474}
    7575
    76 void AXIsolatedTreeNode::setProperty(AXPropertyName propertyName, AttributeValueVariant&& value, bool shouldRemove)
     76void AXIsolatedObject::setProperty(AXPropertyName propertyName, AttributeValueVariant&& value, bool shouldRemove)
    7777{
    7878    ASSERT(!m_initialized);
    … …  
    8585}
    8686
    87 void AXIsolatedTreeNode::appendChild(AXID axID)
     87void AXIsolatedObject::appendChild(AXID axID)
    8888{
    8989    ASSERT(isMainThread());
    … …  
    9191}
    9292
    93 void AXIsolatedTreeNode::setParent(AXID parent)
     93void AXIsolatedObject::setParent(AXID parent)
    9494{
    9595    ASSERT(isMainThread());
    … …  
    9797}
    9898
    99 void AXIsolatedTreeNode::setTreeIdentifier(AXIsolatedTreeID treeIdentifier)
     99void AXIsolatedObject::setTreeIdentifier(AXIsolatedTreeID treeIdentifier)
    100100{
    101101    m_treeIdentifier = treeIdentifier;
    … …  
    104104}
    105105
    106 const AXCoreObject::AccessibilityChildrenVector& AXIsolatedTreeNode::children(bool)
     106const AXCoreObject::AccessibilityChildrenVector& AXIsolatedObject::children(bool)
    107107{
    108108    if (_AXUIElementRequestServicedBySecondaryAXThread()) {
    … …  
    116116}
    117117
    118 AXCoreObject* AXIsolatedTreeNode::focusedUIElement() const
     118AXCoreObject* AXIsolatedObject::focusedUIElement() const
    119119{
    120120    if (auto focusedElement = tree()->focusedUIElement())
    … …  
    123123}
    124124   
    125 AXCoreObject* AXIsolatedTreeNode::parentObjectUnignored() const
     125AXCoreObject* AXIsolatedObject::parentObjectUnignored() const
    126126{
    127127    return tree()->nodeForID(parent()).get();
    128128}
    129129
    130 AXCoreObject* AXIsolatedTreeNode::accessibilityHitTest(const IntPoint& point) const
     130AXCoreObject* AXIsolatedObject::accessibilityHitTest(const IntPoint& point) const
    131131{
    132132    if (!relativeFrame().contains(point))
    … …  
    138138            return child->accessibilityHitTest(point);
    139139    }
    140     return const_cast<AXIsolatedTreeNode*>(this);
    141 }
    142 
    143 AXIsolatedTree* AXIsolatedTreeNode::tree() const
     140    return const_cast<AXIsolatedObject*>(this);
     141}
     142
     143AXIsolatedTree* AXIsolatedObject::tree() const
    144144{
    145145    return m_cachedTree.get();
    146146}
    147147
    148 FloatRect AXIsolatedTreeNode::rectAttributeValue(AXPropertyName propertyName) const
     148FloatRect AXIsolatedObject::rectAttributeValue(AXPropertyName propertyName) const
    149149{
    150150    auto value = m_attributeMap.get(propertyName);
    … …  
    159159}
    160160
    161 double AXIsolatedTreeNode::doubleAttributeValue(AXPropertyName propertyName) const
     161double AXIsolatedObject::doubleAttributeValue(AXPropertyName propertyName) const
    162162{
    163163    auto value = m_attributeMap.get(propertyName);
    … …  
    168168}
    169169
    170 unsigned AXIsolatedTreeNode::unsignedAttributeValue(AXPropertyName propertyName) const
     170unsigned AXIsolatedObject::unsignedAttributeValue(AXPropertyName propertyName) const
    171171{
    172172    auto value = m_attributeMap.get(propertyName);
    … …  
    177177}
    178178
    179 bool AXIsolatedTreeNode::boolAttributeValue(AXPropertyName propertyName) const
     179bool AXIsolatedObject::boolAttributeValue(AXPropertyName propertyName) const
    180180{
    181181    auto value = m_attributeMap.get(propertyName);
    … …  
    186186}
    187187
    188 const String AXIsolatedTreeNode::stringAttributeValue(AXPropertyName propertyName) const
     188const String AXIsolatedObject::stringAttributeValue(AXPropertyName propertyName) const
    189189{
    190190    auto value = m_attributeMap.get(propertyName);
    … …  
    195195}
    196196
    197 int AXIsolatedTreeNode::intAttributeValue(AXPropertyName propertyName) const
     197int AXIsolatedObject::intAttributeValue(AXPropertyName propertyName) const
    198198{
    199199    auto value = m_attributeMap.get(propertyName);
    … …  
    204204}
    205205
    206 void AXIsolatedTreeNode::updateBackingStore()
     206void AXIsolatedObject::updateBackingStore()
    207207{
    208208    if (_AXUIElementRequestServicedBySecondaryAXThread()) {

  • trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.h

    r252181 r252182  
    4646class AXIsolatedTree;
    4747
    48 class AXIsolatedTreeNode final : public AXCoreObject {
     48class AXIsolatedObject final : public AXCoreObject {
    4949public:
    50     static Ref<AXIsolatedTreeNode> create(const AXCoreObject&);
    51     ~AXIsolatedTreeNode();
     50    static Ref<AXIsolatedObject> create(const AXCoreObject&);
     51    ~AXIsolatedObject();
    5252
    5353    void setObjectID(AXID id) override { m_id = id; }
    … …  
    666666    AXIsolatedTree* tree() const;
    667667
    668     AXIsolatedTreeNode() = default;
    669     AXIsolatedTreeNode(const AXCoreObject&);
     668    AXIsolatedObject() = default;
     669    AXIsolatedObject(const AXCoreObject&);
    670670    void initializeAttributeData(const AXCoreObject&);
    671671

  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h

    r251974 r252182  
    3030#define WebAccessibilityObjectWrapperBase_h
    3131
    32 #include "AXIsolatedTree.h"
    33 #include "AXIsolatedTreeNode.h"
    34 #include "AccessibilityObject.h"
     32#include "AccessibilityObjectInterface.h"
    3533#include <CoreGraphics/CoreGraphics.h>
    3634#include <wtf/RefPtr.h>
    … …  
    3937
    4038namespace WebCore {
    41 class AccessibilityObject;
    42 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
    43 class AXIsolatedTreeNode;
    44 #endif
    4539struct AccessibilitySearchCriteria;
    4640class IntRect;
    … …  
    5852- (id)initWithAccessibilityObject:(WebCore::AXCoreObject*)axObject;
    5953
    60 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
    61 @property (nonatomic, readonly) RefPtr<WebCore::AXIsolatedTreeNode> isolatedTreeNode;
    62 @property (nonatomic, assign) WebCore::AXIsolatedTreeID isolatedTreeIdentifier;
    63 #endif
    64 
    6554- (void)detach;
    6655
    … …  
    7059- (BOOL)updateObjectBackingStore;
    7160
    72 // This can be either an AccessibilityObject or an AXIsolatedTreeNode
     61// This can be either an AccessibilityObject or an AXIsolatedObject
    7362- (WebCore::AXCoreObject*)axBackingObject;
    7463
    … …  
    9786extern WebCore::AccessibilitySearchCriteria accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute(const NSDictionary *);
    9887
    99 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
    100 extern NSArray *convertToNSArray(const Vector<RefPtr<WebCore::AXIsolatedTreeNode>>&);
    101 #endif
    102 extern NSArray *convertToNSArray(const WebCore::AccessibilityObject::AccessibilityChildrenVector&);
     88extern NSArray *convertToNSArray(const WebCore::AXCoreObject::AccessibilityChildrenVector&);
    10389
    10490#if PLATFORM(IOS_FAMILY)
Note: See TracChangeset for help on using the changeset viewer.