Oilpan: Prepare moving AXObject to heap

Source/modules/accessibility/AXObject.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 357 matching lines @@
 }
 
 } // namespace
 
 AXObject::AXObject(AXObjectCacheImpl* axObjectCache)
     : m_id(0)
     , m_haveChildren(false)
     , m_role(UnknownRole)
     , m_lastKnownIsIgnoredValue(DefaultBehavior)
     , m_detached(false)
-    , m_parent(0)
+    , m_parent(nullptr)
     , m_lastModificationCount(-1)
     , m_cachedIsIgnored(false)
     , m_cachedIsInertOrAriaHidden(false)
     , m_cachedIsDescendantOfLeafNode(false)
     , 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()
 {
     // Clear any children and call detachFromParent on them so that
     // no children are left with dangling pointers to their parent.
     clearChildren();
 
     m_detached = true;
 }
@@ skipping 255 matching lines @@
     updateCachedAttributeValuesIfNeeded();
     return m_cachedHasInheritedPresentationalRole;
 }
 
 bool AXObject::isPresentationalChild() const
 {
     updateCachedAttributeValuesIfNeeded();
     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);
 }
 
 // In ARIA 1.1, the default value for aria-orientation changed from horizontal to undefined.
 AccessibilityOrientation AXObject::orientation() const
 {
     return AccessibilityOrientationUndefined;
 }
 
 static String queryString(WebLocalizedString::Name name)
@@ skipping 785 matching lines @@
     return roleNameVector->at(role);
 }
 
 const AtomicString& AXObject::internalRoleName(AccessibilityRole role)
 {
     static const Vector<AtomicString>* internalRoleNameVector = createInternalRoleNameVector();
 
     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