Oilpan: Prepare moving AXObject to heap

Source/web/WebAXObject.cpp

Index: Source/web/WebAXObject.cpp
diff --git a/Source/web/WebAXObject.cpp b/Source/web/WebAXObject.cpp
index 3d1bcda047bb94e54e0f2ac7fe11a552326de915..8c5eeef0facb899eabba95608d757b1bce8a6885 100644
--- a/Source/web/WebAXObject.cpp
+++ b/Source/web/WebAXObject.cpp
@@ -72,15 +72,10 @@ static bool isLayoutClean(Document* document)
 #endif
 
 WebScopedAXContext::WebScopedAXContext(WebDocument& rootDocument)
-    : m_private(adoptRef(new ScopedAXObjectCache(*rootDocument.unwrap<Document>())))
+    : m_private(adoptPtr(new ScopedAXObjectCache(*rootDocument.unwrap<Document>())))
 {
 }
 
-WebScopedAXContext::~WebScopedAXContext()
-{
-    m_private.reset();
-}
-
 WebAXObject WebScopedAXContext::root() const
 {
     return WebAXObject(static_cast<AXObjectCacheImpl*>(m_private->get())->root());
@@ -689,7 +684,7 @@ WebAXObject WebAXObject::hitTest(const WebPoint& point) const
         return WebAXObject();
 
     IntPoint contentsPoint = m_private->documentFrameView()->soonToBeRemovedUnscaledViewportToContents(point);
-    RefPtr<AXObject> hit = m_private->accessibilityHitTest(contentsPoint);
+    RefPtrWillBeRawPtr<AXObject> hit = m_private->accessibilityHitTest(contentsPoint);
 
     if (hit)
         return WebAXObject(hit);
@@ -984,7 +979,7 @@ WebString WebAXObject::name(WebAXNameFrom& outNameFrom, WebVector<WebAXObject>&
         return WebString();
 
     AXNameFrom nameFrom = AXNameFromAttribute;
-    Vector<AXObject*> nameObjects;
+    WillBeHeapVector<RawPtrWillBeMember<AXObject>> nameObjects;
     WebString result = m_private->name(nameFrom, nameObjects);
     outNameFrom = static_cast<WebAXNameFrom>(nameFrom);
 
@@ -1002,7 +997,7 @@ WebString WebAXObject::description(WebAXNameFrom nameFrom, WebAXDescriptionFrom&
         return WebString();
 
     AXDescriptionFrom descriptionFrom;
-    Vector<AXObject*> descriptionObjects;
+    WillBeHeapVector<RawPtrWillBeMember<AXObject>> descriptionObjects;
     String result = m_private->description(static_cast<AXNameFrom>(nameFrom), descriptionFrom, descriptionObjects);
     outDescriptionFrom = static_cast<WebAXDescriptionFrom>(descriptionFrom);
 
@@ -1441,18 +1436,18 @@ void WebAXObject::scrollToGlobalPoint(const WebPoint& point) const
         m_private->scrollToGlobalPoint(point);
 }
 
-WebAXObject::WebAXObject(const WTF::PassRefPtr<AXObject>& object)
+WebAXObject::WebAXObject(const PassRefPtrWillBeRawPtr<AXObject>& object)
     : m_private(object)
 {
 }
 
-WebAXObject& WebAXObject::operator=(const WTF::PassRefPtr<AXObject>& object)
+WebAXObject& WebAXObject::operator=(const PassRefPtrWillBeRawPtr<AXObject>& object)
 {
     m_private = object;
     return *this;
 }
 
-WebAXObject::operator WTF::PassRefPtr<AXObject>() const
+WebAXObject::operator PassRefPtrWillBeRawPtr<AXObject>() const
 {
     return m_private.get();
 }