Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1437)

Unified Diff: Source/modules/accessibility/AXNodeObject.h

Issue 1072273006: Oilpan: Prepare moving AXObject to heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/accessibility/AXNodeObject.h
diff --git a/Source/modules/accessibility/AXNodeObject.h b/Source/modules/accessibility/AXNodeObject.h
index 1b2f7818a46e43dbd1097f1b4019e801b3928f3a..5dafbc9bffbc63d6483d14cfc73a616659cdc58b 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.
@@ -170,7 +171,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;
@@ -212,11 +213,11 @@ protected:
void computeAriaOwnsChildren(Vector<AXObject*>& ownedChildren);
private:
- Node* m_node;
+ RawPtrWillBeMember<Node> m_node;
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;

Powered by Google App Engine
This is Rietveld 408576698