Oilpan: Prepare to move AXObjectCache to the heap

Source/core/dom/AXObjectCache.h

Index: Source/core/dom/AXObjectCache.h
diff --git a/Source/core/dom/AXObjectCache.h b/Source/core/dom/AXObjectCache.h
index e73da6b63fe417d2e13e25986925628f0763252c..6cfa2ecfe840ad15f49cbb58d2406cc6e24b0964 100644
--- a/Source/core/dom/AXObjectCache.h
+++ b/Source/core/dom/AXObjectCache.h
@@ -40,14 +40,16 @@ class LayoutMenuList;
 class Page;
 class Widget;
 
-class CORE_EXPORT AXObjectCache {
-    WTF_MAKE_NONCOPYABLE(AXObjectCache); WTF_MAKE_FAST_ALLOCATED(AXObjectCache);
+class CORE_EXPORT AXObjectCache : public NoBaseWillBeGarbageCollectedFinalized<AXObjectCache> {
+    WTF_MAKE_NONCOPYABLE(AXObjectCache);
+    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(AXObjectCache);
 public:
-    static PassOwnPtr<AXObjectCache> create(Document&);
+    static PassOwnPtrWillBeRawPtr<AXObjectCache> create(Document&);
 
     static AXObject* focusedUIElementForPage(const Page*);
 
     virtual ~AXObjectCache();
+    DEFINE_INLINE_VIRTUAL_TRACE() { }
 
     enum AXNotification {
         AXActiveDescendantChanged,
@@ -81,6 +83,8 @@ public:
         AXValueChanged
     };
 
+    virtual void dispose() = 0;
+
     virtual void selectionChanged(Node*) = 0;
     virtual void childrenChanged(Node*) = 0;
     virtual void childrenChanged(LayoutObject*) = 0;
@@ -131,7 +135,7 @@ public:
     virtual const AtomicString& computedRoleForNode(Node*) = 0;
     virtual String computedNameForNode(Node*) = 0;
 
-    typedef PassOwnPtr<AXObjectCache> (*AXObjectCacheCreateFunction)(Document&);
+    typedef PassOwnPtrWillBeRawPtr<AXObjectCache> (*AXObjectCacheCreateFunction)(Document&);
     static void init(AXObjectCacheCreateFunction);
 
 protected:
@@ -145,13 +149,18 @@ class CORE_EXPORT ScopedAXObjectCache {
     WTF_MAKE_NONCOPYABLE(ScopedAXObjectCache);
 public:
     explicit ScopedAXObjectCache(Document&);
+    ~ScopedAXObjectCache();
 
     AXObjectCache* get();
     AXObjectCache* operator->();
 
 private:
+#if ENABLE(OILPAN)
+    bool m_isOwned;
+#else
     OwnPtr<AXObjectCache> m_ownedCache;

[haraken, 2015/04/28 10:45:20]

Why can't we just use OwnPtrWillBePersistent (and avoid having the OILPAN
branch)?

[keishi, 2015/05/28 06:49:15]

Done.

-    AXObjectCache* m_cache;
+#endif
+    RawPtrWillBePersistent<AXObjectCache> m_cache;
 };
 
 }