Chromium Code Reviews| Index: Source/modules/accessibility/AXNodeObject.h |
| diff --git a/Source/modules/accessibility/AXNodeObject.h b/Source/modules/accessibility/AXNodeObject.h |
| index 037659b82681e94fcf0761d4b2468a85b8ba7b11..7b228952e39fa69e83a8668ad8fed00382a9b3f4 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; |
| @@ -206,11 +207,11 @@ protected: |
| virtual int setSize() const override; |
| private: |
| - Node* m_node; |
| + RawPtrWillBeWeakMember<Node> m_node; |
|
haraken
2015/05/28 10:48:40
Why does this need to be weak?
What confuses me i
|
| String alternativeTextForWebArea() const; |
| - void alternativeText(Vector<AccessibilityText>&) const; |
| - void ariaLabeledByText(Vector<AccessibilityText>&) const; |
| + void alternativeText(WillBeHeapVector<OwnPtrWillBeMember<AccessibilityText>>&) const; |
| + void ariaLabeledByText(WillBeHeapVector<OwnPtrWillBeMember<AccessibilityText>>&) const; |
| float stepValueForRange() const; |
| AXObject* findChildWithTagName(const HTMLQualifiedName&) const; |
| bool isDescendantOfElementType(const HTMLQualifiedName& tagName) const; |