Chromium Code Reviews| Index: Source/modules/accessibility/AXNodeObject.h |
| diff --git a/Source/modules/accessibility/AXNodeObject.h b/Source/modules/accessibility/AXNodeObject.h |
| index a79478038fd67e24543eda47048d603d6fe81e70..901ff636afcbb701d8bc24598d61ad9eb6750dbc 100644 |
| --- a/Source/modules/accessibility/AXNodeObject.h |
| +++ b/Source/modules/accessibility/AXNodeObject.h |
| @@ -46,8 +46,9 @@ protected: |
| AXNodeObject(Node*, AXObjectCacheImpl&); |
| public: |
| - static PassRefPtr<AXNodeObject> create(Node*, AXObjectCacheImpl&); |
| + static PassRefPtrWillBeRawPtr<AXNodeObject> create(Node*, AXObjectCacheImpl&); |
| virtual ~AXNodeObject(); |
| + DECLARE_VIRTUAL_TRACE(); |
| protected: |
| // Protected data. |
| @@ -167,7 +168,7 @@ protected: |
| virtual String computedName() const override; |
| // New AX name calculation. |
| - virtual String textAlternative(bool recursive, bool inAriaLabelledByTraversal, HashSet<AXObject*>& visited, AXNameFrom*, Vector<AXObject*>* nameObjects) override; |
| + virtual String textAlternative(bool recursive, bool inAriaLabelledByTraversal, WillBeHeapHashSet<RawPtrWillBeMember<AXObject>>& visited, AXNameFrom*, WillBeHeapVector<RawPtrWillBeMember<AXObject>>* nameObjects) override; |
| // Location and click point in frame-relative coordinates. |
| virtual LayoutRect elementRect() const override; |
| @@ -209,7 +210,7 @@ protected: |
| void computeAriaOwnsChildren(Vector<AXObject*>& ownedChildren); |
| private: |
| - Node* m_node; |
| + RawPtrWillBeWeakMember<Node> m_node; |
|
haraken
2015/06/24 13:27:20
Member.
keishi
2015/06/24 15:05:26
Done.
|
| String alternativeTextForWebArea() const; |
| void alternativeText(WillBeHeapVector<OwnPtrWillBeMember<AccessibilityText>>&) const; |