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

Side by Side Diff: src/core/SkDeviceProfile.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 | « include/private/SkMutex.h ('k') | src/core/SkPaint.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 2012 Google Inc. 2 * Copyright 2012 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 8
9 #include "SkDeviceProfile.h" 9 #include "SkDeviceProfile.h"
10 #include "SkMutex.h" 10 #include "SkMutex.h"
(...skipping 26 matching lines...) Expand all
37 37
38 /////////////////////////////////////////////////////////////////////////////// 38 ///////////////////////////////////////////////////////////////////////////////
39 39
40 SkDeviceProfile* SkDeviceProfile::Create(float gammaExp, 40 SkDeviceProfile* SkDeviceProfile::Create(float gammaExp,
41 float contrast, 41 float contrast,
42 LCDConfig config, 42 LCDConfig config,
43 FontHintLevel level) { 43 FontHintLevel level) {
44 return new SkDeviceProfile(gammaExp, contrast, config, level); 44 return new SkDeviceProfile(gammaExp, contrast, config, level);
45 } 45 }
46 46
47 static SkMutex gMutex; 47 SK_DECLARE_STATIC_MUTEX(gMutex);
48 static SkDeviceProfile* gDefaultProfile; 48 static SkDeviceProfile* gDefaultProfile;
49 static SkDeviceProfile* gGlobalProfile; 49 static SkDeviceProfile* gGlobalProfile;
50 50
51 SkDeviceProfile* SkDeviceProfile::GetDefault() { 51 SkDeviceProfile* SkDeviceProfile::GetDefault() {
52 SkAutoMutexAcquire amc(gMutex); 52 SkAutoMutexAcquire amc(gMutex);
53 53
54 if (nullptr == gDefaultProfile) { 54 if (nullptr == gDefaultProfile) {
55 gDefaultProfile = SkDeviceProfile::Create(DEFAULT_GAMMAEXP, 55 gDefaultProfile = SkDeviceProfile::Create(DEFAULT_GAMMAEXP,
56 DEFAULT_CONTRASTSCALE, 56 DEFAULT_CONTRASTSCALE,
57 DEFAULT_LCDCONFIG, 57 DEFAULT_LCDCONFIG,
(...skipping 10 matching lines...) Expand all
68 } 68 }
69 gGlobalProfile->ref(); 69 gGlobalProfile->ref();
70 return gGlobalProfile; 70 return gGlobalProfile;
71 } 71 }
72 72
73 void SkDeviceProfile::SetGlobal(SkDeviceProfile* profile) { 73 void SkDeviceProfile::SetGlobal(SkDeviceProfile* profile) {
74 SkAutoMutexAcquire amc(gMutex); 74 SkAutoMutexAcquire amc(gMutex);
75 75
76 SkRefCnt_SafeAssign(gGlobalProfile, profile); 76 SkRefCnt_SafeAssign(gGlobalProfile, profile);
77 } 77 }
OLDNEW
« no previous file with comments | « include/private/SkMutex.h ('k') | src/core/SkPaint.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698