Oilpan: Prepare to move AXObjectCache to the heap

Source/core/dom/AXObjectCache.cpp

 /*
  * Copyright (C) 2008, 2009, 2010 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 22 matching lines @@
 namespace blink {
 
 AXObjectCache::AXObjectCacheCreateFunction AXObjectCache::m_createFunction = nullptr;
 
 void AXObjectCache::init(AXObjectCacheCreateFunction function)
 {
     ASSERT(!m_createFunction);
     m_createFunction = function;
 }
 
-PassOwnPtr<AXObjectCache> AXObjectCache::create(Document& document)
+PassOwnPtrWillBeRawPtr<AXObjectCache> AXObjectCache::create(Document& document)
 {
     ASSERT(m_createFunction);
     return (m_createFunction)(document);
 }
 
 AXObjectCache::AXObjectCache()
 {
 }
 
 AXObjectCache::~AXObjectCache()
 {
 }
 
-PassOwnPtr<ScopedAXObjectCache> ScopedAXObjectCache::create(Document& document)
+PassOwnPtrWillBeRawPtr<ScopedAXObjectCache> ScopedAXObjectCache::create(Document& document)
 {
-    return adoptPtr(new ScopedAXObjectCache(document));
+    return adoptPtrWillBeNoop(new ScopedAXObjectCache(document));
 }
 
 ScopedAXObjectCache::ScopedAXObjectCache(Document& document)
     : m_ownedCache(nullptr)
     , m_cache(nullptr)
+#if ENABLE(ASSERT)
+    , m_hasBeenDisposed(false)
+#endif
 {
     if (AXObjectCache* existingCache = document.axObjectCache()) {
         m_cache = existingCache;
     } else {
         m_ownedCache = AXObjectCache::create(document);
         m_cache = m_ownedCache.get();
     }
 }
 
+ScopedAXObjectCache::~ScopedAXObjectCache()
+{
+    ASSERT(m_hasBeenDisposed);
+}
+
+void ScopedAXObjectCache::dispose()
+{
+    if (m_ownedCache)
+        m_ownedCache->dispose();
+#if ENABLE(ASSERT)
+    m_hasBeenDisposed = true;
+#endif
+}
+
 AXObjectCache* ScopedAXObjectCache::get()
 {
     ASSERT(m_cache);
     return m_cache;
 }
 
+DEFINE_TRACE(ScopedAXObjectCache)
+{
+    visitor->trace(m_ownedCache);
+    visitor->trace(m_cache);
+}
+
 } // namespace blink