Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(694)

Unified Diff: Source/core/dom/AXObjectCache.cpp

Issue 1088473002: Refactor ScopedAXObjectCache to remove ref count (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed m_ownedCache init Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/AXObjectCache.h ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/AXObjectCache.cpp
diff --git a/Source/core/dom/AXObjectCache.cpp b/Source/core/dom/AXObjectCache.cpp
index 340616585a1efceb73bd691051ee2524ed4b56dc..b31a5b3b637ec20c202043e083c688a639536941 100644
--- a/Source/core/dom/AXObjectCache.cpp
+++ b/Source/core/dom/AXObjectCache.cpp
@@ -40,7 +40,7 @@ void AXObjectCache::init(AXObjectCacheCreateFunction function)
m_createFunction = function;
}
-AXObjectCache* AXObjectCache::create(Document& document)
+PassOwnPtr<AXObjectCache> AXObjectCache::create(Document& document)
{
ASSERT(m_createFunction);
return (m_createFunction)(document);
@@ -54,34 +54,26 @@ AXObjectCache::~AXObjectCache()
{
}
+PassOwnPtr<ScopedAXObjectCache> ScopedAXObjectCache::create(Document& document)
+{
+ return adoptPtr(new ScopedAXObjectCache(document));
+}
+
ScopedAXObjectCache::ScopedAXObjectCache(Document& document)
- : m_document(document)
- , m_cache(0)
+ : m_cache(nullptr)
{
if (AXObjectCache* existingCache = document.axObjectCache()) {
m_cache = existingCache;
- m_isScoped = false;
} else {
- m_isScoped = true;
- m_cache = AXObjectCache::create(m_document);
+ m_ownedCache = AXObjectCache::create(document);
+ m_cache = m_ownedCache.get();
}
}
-ScopedAXObjectCache::~ScopedAXObjectCache()
-{
- if (m_isScoped)
- delete m_cache;
-}
-
AXObjectCache* ScopedAXObjectCache::get()
{
ASSERT(m_cache);
return m_cache;
}
-AXObjectCache* ScopedAXObjectCache::operator->()
-{
- return get();
-}
-
} // namespace blink
« no previous file with comments | « Source/core/dom/AXObjectCache.h ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698