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

Side by Side Diff: src/core/SkGlyphCache_Globals.h

Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years, 5 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/core/SkGlyphCache.cpp ('k') | src/core/SkImageFilter.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 2010 Google Inc. 2 * Copyright 2010 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 #ifndef SkGlyphCache_Globals_DEFINED 8 #ifndef SkGlyphCache_Globals_DEFINED
9 #define SkGlyphCache_Globals_DEFINED 9 #define SkGlyphCache_Globals_DEFINED
10 10
11 #include "SkGlyphCache.h" 11 #include "SkGlyphCache.h"
12 #include "SkMutex.h"
13 #include "SkTLS.h" 12 #include "SkTLS.h"
14 13
15 #ifndef SK_DEFAULT_FONT_CACHE_COUNT_LIMIT 14 #ifndef SK_DEFAULT_FONT_CACHE_COUNT_LIMIT
16 #define SK_DEFAULT_FONT_CACHE_COUNT_LIMIT 2048 15 #define SK_DEFAULT_FONT_CACHE_COUNT_LIMIT 2048
17 #endif 16 #endif
18 17
19 #ifndef SK_DEFAULT_FONT_CACHE_LIMIT 18 #ifndef SK_DEFAULT_FONT_CACHE_LIMIT
20 #define SK_DEFAULT_FONT_CACHE_LIMIT (2 * 1024 * 1024) 19 #define SK_DEFAULT_FONT_CACHE_LIMIT (2 * 1024 * 1024)
21 #endif 20 #endif
22 21
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 static void* CreateTLS() { 113 static void* CreateTLS() {
115 return SkNEW_ARGS(SkGlyphCache_Globals, (kNo_UseMutex)); 114 return SkNEW_ARGS(SkGlyphCache_Globals, (kNo_UseMutex));
116 } 115 }
117 116
118 static void DeleteTLS(void* ptr) { 117 static void DeleteTLS(void* ptr) {
119 SkDELETE((SkGlyphCache_Globals*)ptr); 118 SkDELETE((SkGlyphCache_Globals*)ptr);
120 } 119 }
121 }; 120 };
122 121
123 #endif 122 #endif
OLDNEW
« no previous file with comments | « src/core/SkGlyphCache.cpp ('k') | src/core/SkImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698