diff options
author | 2016-05-04 15:21:12 -0700 | |
---|---|---|
committer | 2016-05-04 15:21:12 -0700 | |
commit | 5e56cfd3fa1041dbb83899844fb92fa9a2ef1009 (patch) | |
tree | f272195cafb5a417284f9e28fa4155454c237938 /src/ports/SkFontHost_mac.cpp | |
parent | 9bd3fc7fa9bb7cad050bd619aa93d4c48ebb5c02 (diff) |
SK_DECLARE_STATIC_MUTEX -> static SkMutex
There's no need to use a macro to declare static SkMutexes any more
(and there's likewise no need to restrict them to global scope).
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1948193002
Review-Url: https://codereview.chromium.org/1948193002
Diffstat (limited to 'src/ports/SkFontHost_mac.cpp')
-rw-r--r-- | src/ports/SkFontHost_mac.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 8593b39611..6f0bbad6bd 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -54,7 +54,7 @@ #define USE_GLOBAL_MUTEX_FOR_CG_ACCESS #ifdef USE_GLOBAL_MUTEX_FOR_CG_ACCESS - SK_DECLARE_STATIC_MUTEX(gCGMutex); + static SkMutex gCGMutex; #define AUTO_CG_LOCK() SkAutoMutexAcquire amc(gCGMutex) #else #define AUTO_CG_LOCK() @@ -550,7 +550,7 @@ static SkTypeface* NewFromName(const char familyName[], const SkFontStyle& theSt return face; } -SK_DECLARE_STATIC_MUTEX(gGetDefaultFaceMutex); +static SkMutex gGetDefaultFaceMutex; static SkTypeface* GetDefaultFace() { SkAutoMutexAcquire ma(gGetDefaultFaceMutex); |