Oilpan: Prepare moving AXObject to heap

Source/modules/accessibility/AXObject.cpp

Index: Source/modules/accessibility/AXObject.cpp
diff --git a/Source/modules/accessibility/AXObject.cpp b/Source/modules/accessibility/AXObject.cpp
index fe05ee518c85299802d3391f787731cb03284a7b..b9d1b446d9489adcbf097dc0a730a113b6a39a9b 100644
--- a/Source/modules/accessibility/AXObject.cpp
+++ b/Source/modules/accessibility/AXObject.cpp
@@ -375,7 +375,7 @@ AXObject::AXObject(AXObjectCacheImpl* axObjectCache)
     , m_role(UnknownRole)
     , m_lastKnownIsIgnoredValue(DefaultBehavior)
     , m_detached(false)
-    , m_parent(0)
+    , m_parent(nullptr)
     , m_lastModificationCount(-1)
     , m_cachedIsIgnored(false)
     , m_cachedIsInertOrAriaHidden(false)
@@ -383,14 +383,16 @@ AXObject::AXObject(AXObjectCacheImpl* axObjectCache)
     , m_cachedIsDescendantOfDisabledNode(false)
     , m_cachedHasInheritedPresentationalRole(false)
     , m_cachedIsPresentationalChild(false)
-    , m_cachedLiveRegionRoot(0)
+    , m_cachedLiveRegionRoot(nullptr)
     , m_axObjectCache(axObjectCache)
 {
 }
 
 AXObject::~AXObject()
 {
+#if !ENABLE(OILPAN)
     ASSERT(isDetached());

[haraken, 2015/05/28 10:48:40]

Just help me understand: In what scenario is it possible that we reach here
without calling detach()?

Just to confirm: detach() of AXObjects are not doing anything than just clearing
some pointers? Otherwise, not calling detach() in some cases would cause a
problem.

[keishi, 2015/06/08 06:27:20]

Reverted.

+#endif
 }
 
 void AXObject::detach()
@@ -666,9 +668,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);
 }
 
@@ -1474,4 +1476,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