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

Side by Side Diff: src/lazy/SkDiscardableMemoryPool.cpp

Issue 1945353003: Revert of SK_DECLARE_STATIC_MUTEX -> static SkMutex (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « src/fonts/SkTestScalerContext.cpp ('k') | src/pathops/SkPathOpsDebug.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkDiscardableMemory.h" 8 #include "SkDiscardableMemory.h"
9 #include "SkDiscardableMemoryPool.h" 9 #include "SkDiscardableMemoryPool.h"
10 #include "SkImageGenerator.h" 10 #include "SkImageGenerator.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 SkAutoMutexAcquire autoMutexAcquire(fMutex); 237 SkAutoMutexAcquire autoMutexAcquire(fMutex);
238 this->dumpDownTo(0); 238 this->dumpDownTo(0);
239 } 239 }
240 240
241 } // namespace 241 } // namespace
242 242
243 SkDiscardableMemoryPool* SkDiscardableMemoryPool::Create(size_t size, SkMutex* m utex) { 243 SkDiscardableMemoryPool* SkDiscardableMemoryPool::Create(size_t size, SkMutex* m utex) {
244 return new DiscardableMemoryPool(size, mutex); 244 return new DiscardableMemoryPool(size, mutex);
245 } 245 }
246 246
247 static SkMutex gMutex; 247 SK_DECLARE_STATIC_MUTEX(gMutex);
248 248
249 SkDiscardableMemoryPool* SkGetGlobalDiscardableMemoryPool() { 249 SkDiscardableMemoryPool* SkGetGlobalDiscardableMemoryPool() {
250 static SkOnce once; 250 static SkOnce once;
251 static SkDiscardableMemoryPool* global; 251 static SkDiscardableMemoryPool* global;
252 once([]{ 252 once([]{
253 global = SkDiscardableMemoryPool::Create(SK_DEFAULT_GLOBAL_DISCARDABLE_M EMORY_POOL_SIZE, 253 global = SkDiscardableMemoryPool::Create(SK_DEFAULT_GLOBAL_DISCARDABLE_M EMORY_POOL_SIZE,
254 &gMutex); 254 &gMutex);
255 }); 255 });
256 return global; 256 return global;
257 } 257 }
OLDNEW
« no previous file with comments | « src/fonts/SkTestScalerContext.cpp ('k') | src/pathops/SkPathOpsDebug.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698