Oilpan: Prepare moving AXObject to 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;
 }
 
-AXObjectCache* AXObjectCache::create(Document& document)
+PassOwnPtrWillBeRawPtr<AXObjectCache> AXObjectCache::create(Document& document)
 {
     ASSERT(m_createFunction);
     return (m_createFunction)(document);
 }
 
 AXObjectCache::AXObjectCache()
 {
 }
 
 AXObjectCache::~AXObjectCache()
 {
 }
 
 ScopedAXObjectCache::ScopedAXObjectCache(Document& document)
-    : m_document(document)
-    , m_cache(0)
+#if ENABLE(OILPAN)
+    : m_isOwned(false)
+#else
+    : m_ownedCache(nullptr)
+#endif
+    , m_cache(nullptr)
 {
     if (AXObjectCache* existingCache = document.axObjectCache()) {
         m_cache = existingCache;
-        m_isScoped = false;
     } else {
-        m_isScoped = true;
-        m_cache = AXObjectCache::create(m_document);
+#if ENABLE(OILPAN)
+        m_isOwned = true;
+        m_cache = AXObjectCache::create(document);
+#else
+        m_ownedCache = AXObjectCache::create(document);
+        m_cache = m_ownedCache.get();
+#endif
     }
 }
 
 ScopedAXObjectCache::~ScopedAXObjectCache()
 {
-    if (m_isScoped)
-        delete m_cache;
+#if ENABLE(OILPAN)
+    if (m_isOwned) {
+#else
+    if (m_ownedCache) {
+#endif
+        m_cache->dispose();
+    }
 }
 
 AXObjectCache* ScopedAXObjectCache::get()
 {
     ASSERT(m_cache);
     return m_cache;
 }
 
 AXObjectCache* ScopedAXObjectCache::operator->()
 {
     return get();
 }
 
 } // namespace blink