Oilpan: Prepare moving AXObject to heap

Source/modules/accessibility/AXScrollView.cpp

Index: Source/modules/accessibility/AXScrollView.cpp
diff --git a/Source/modules/accessibility/AXScrollView.cpp b/Source/modules/accessibility/AXScrollView.cpp
index 039ae8761cd027b32b7e85fe9c2a4da684c49a27..d3bee070e5a981f423bf628eed5aaee1a539de81 100644
--- a/Source/modules/accessibility/AXScrollView.cpp
+++ b/Source/modules/accessibility/AXScrollView.cpp
@@ -43,18 +43,20 @@ AXScrollView::AXScrollView(FrameView* view, AXObjectCacheImpl* axObjectCache)
 
 AXScrollView::~AXScrollView()
 {
+#if !ENABLE(OILPAN)

[haraken, 2015/06/09 02:25:45]

Do we need the #if? In other words, is it possible that the destructor of
AXScrollView gets called without AXScrollView::detach getting called?

     ASSERT(isDetached());
+#endif
 }
 
 void AXScrollView::detach()
 {
     AXObject::detach();
-    m_scrollView = 0;
+    m_scrollView = nullptr;
 }
 
-PassRefPtr<AXScrollView> AXScrollView::create(FrameView* view, AXObjectCacheImpl* axObjectCache)
+PassRefPtrWillBeRawPtr<AXScrollView> AXScrollView::create(FrameView* view, AXObjectCacheImpl* axObjectCache)
 {
-    return adoptRef(new AXScrollView(view, axObjectCache));
+    return adoptRefWillBeNoop(new AXScrollView(view, axObjectCache));
 }
 
 AXObject* AXScrollView::scrollBar(AccessibilityOrientation orientation)
@@ -253,4 +255,12 @@ ScrollableArea* AXScrollView::getScrollableAreaIfScrollable() const
     return m_scrollView;
 }
 
+DEFINE_TRACE(AXScrollView)
+{
+    visitor->trace(m_scrollView);
+    visitor->trace(m_horizontalScrollbar);
+    visitor->trace(m_verticalScrollbar);
+    AXObject::trace(visitor);
+}
+
 } // namespace blink