Chromium Code Reviews| Index: Source/modules/accessibility/AXObject.cpp |
| diff --git a/Source/modules/accessibility/AXObject.cpp b/Source/modules/accessibility/AXObject.cpp |
| index d32949862ce207240aef7bef12bfb99dedfe2c43..9c384aa48467db903cdd1e6ce6f175c47afaa211 100644 |
| --- a/Source/modules/accessibility/AXObject.cpp |
| +++ b/Source/modules/accessibility/AXObject.cpp |
| @@ -375,7 +375,7 @@ AXObject::AXObject(AXObjectCacheImpl& axObjectCache) |
| , m_haveChildren(false) |
| , m_role(UnknownRole) |
| , m_lastKnownIsIgnoredValue(DefaultBehavior) |
| - , m_parent(0) |
| + , m_parent(nullptr) |
| , m_lastModificationCount(-1) |
| , m_cachedIsIgnored(false) |
| , m_cachedIsInertOrAriaHidden(false) |
| @@ -383,7 +383,7 @@ AXObject::AXObject(AXObjectCacheImpl& axObjectCache) |
| , m_cachedIsDescendantOfDisabledNode(false) |
| , m_cachedHasInheritedPresentationalRole(false) |
| , m_cachedIsPresentationalChild(false) |
| - , m_cachedLiveRegionRoot(0) |
| + , m_cachedLiveRegionRoot(nullptr) |
| , m_axObjectCache(&axObjectCache) |
| { |
| } |
| @@ -398,7 +398,6 @@ void AXObject::detach() |
| // Clear any children and call detachFromParent on them so that |
| // no children are left with dangling pointers to their parent. |
| clearChildren(); |
| - |
|
tkent
2015/06/25 00:20:47
unnecessary change
keishi
2015/06/25 03:29:28
Done.
|
| m_axObjectCache = nullptr; |
| } |
| @@ -667,9 +666,9 @@ bool AXObject::isPresentationalChild() const |
| return m_cachedIsPresentationalChild; |
| } |
| -String AXObject::name(AXNameFrom& nameFrom, Vector<AXObject*>& nameObjects) |
| +String AXObject::name(AXNameFrom& nameFrom, WillBeHeapVector<RawPtrWillBeMember<AXObject>>& nameObjects) |
| { |
| - HashSet<AXObject*> visited; |
| + WillBeHeapHashSet<RawPtrWillBeMember<AXObject>> visited; |
| return textAlternative(false, false, visited, &nameFrom, &nameObjects); |
| } |
| @@ -1480,4 +1479,12 @@ const AtomicString& AXObject::internalRoleName(AccessibilityRole role) |
| return internalRoleNameVector->at(role); |
| } |
| +DEFINE_TRACE(AXObject) |
| +{ |
| + visitor->trace(m_children); |
| + visitor->trace(m_parent); |
| + visitor->trace(m_cachedLiveRegionRoot); |
| + visitor->trace(m_axObjectCache); |
| +} |
| + |
| } // namespace blink |