aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/lazy/SkDiscardableMemoryPool.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-30 21:00:52 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-30 21:00:52 +0000
commitf6351a071810b3a848a5002a0c0ba7e1490fd0db (patch)
tree07dcff256e7ba4b7a1a7b2cb5b6fdca8c42938c5 /src/lazy/SkDiscardableMemoryPool.cpp
parent97f5fc651956287e78e35934cf62b9e1b45b4f6c (diff)
Revert of Port most uses of SkOnce to SkLazyPtr. (https://codereview.chromium.org/304383005/)
Reason for revert: Leaking refs on SkTypeface on Macs. Original issue's description: > Port most uses of SkOnce to SkLazyPtr. > > BUG=skia: > > Committed: http://code.google.com/p/skia/source/detail?r=15006 R=reed@google.com, mtklein@chromium.org TBR=mtklein@chromium.org, reed@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: mtklein@google.com Review URL: https://codereview.chromium.org/304283007 git-svn-id: http://skia.googlecode.com/svn/trunk@15009 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/lazy/SkDiscardableMemoryPool.cpp')
-rw-r--r--src/lazy/SkDiscardableMemoryPool.cpp23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/lazy/SkDiscardableMemoryPool.cpp b/src/lazy/SkDiscardableMemoryPool.cpp
index 1d63a0bad7..4fb8ae4fe1 100644
--- a/src/lazy/SkDiscardableMemoryPool.cpp
+++ b/src/lazy/SkDiscardableMemoryPool.cpp
@@ -7,7 +7,7 @@
#include "SkDiscardableMemory.h"
#include "SkDiscardableMemoryPool.h"
-#include "SkLazyPtr.h"
+#include "SkOnce.h"
#include "SkTInternalLList.h"
#include "SkThread.h"
@@ -248,20 +248,27 @@ void DiscardableMemoryPool::dumpPool() {
////////////////////////////////////////////////////////////////////////////////
SK_DECLARE_STATIC_MUTEX(gMutex);
-SkDiscardableMemoryPool* create_global_pool() {
- return SkDiscardableMemoryPool::Create(SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE,
- &gMutex);
+SkDiscardableMemoryPool* gPool = NULL;
+void create_global_pool(int) {
+ SkASSERT(NULL == gPool);
+ gPool = SkDiscardableMemoryPool::Create(
+ SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE, &gMutex);
+}
+void cleanup_global_pool() {
+ gPool->unref();
}
-
} // namespace
-SkDiscardableMemoryPool* SkDiscardableMemoryPool::Create(size_t size, SkBaseMutex* mutex) {
+SkDiscardableMemoryPool* SkDiscardableMemoryPool::Create(
+ size_t size, SkBaseMutex* mutex) {
return SkNEW_ARGS(DiscardableMemoryPool, (size, mutex));
}
SkDiscardableMemoryPool* SkGetGlobalDiscardableMemoryPool() {
- SK_DECLARE_STATIC_LAZY_PTR(SkDiscardableMemoryPool, global, create_global_pool);
- return global.get();
+ SK_DECLARE_STATIC_ONCE(create_pool_once);
+ SkOnce(&create_pool_once, create_global_pool, 0, &cleanup_global_pool);
+ SkASSERT(NULL != gPool);
+ return gPool;
}
// defined in SkImageGenerator.h