From 086eea93b1f8253420c233c33cdabc0e74b08091 Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 4 May 2016 17:12:46 -0700 Subject: Revert of SK_DECLARE_STATIC_MUTEX -> static SkMutex (patchset #1 id:1 of https://codereview.chromium.org/1948193002/ ) Reason for revert: broken the Mac and Linux builders, e.g.: https://build.chromium.org/p/chromium/builders/Mac/builds/15151 https://build.chromium.org/p/chromium/builders/Linux%20x64/builds/19052 Original issue's description: > 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 > > Committed: https://skia.googlesource.com/skia/+/5e56cfd3fa1041dbb83899844fb92fa9a2ef1009 TBR=mtklein@google.com,mtklein@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/1945353003 --- src/ports/SkFontConfigInterface_direct.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ports/SkFontConfigInterface_direct.cpp') diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp index f2360020ad..d6fa96a46c 100644 --- a/src/ports/SkFontConfigInterface_direct.cpp +++ b/src/ports/SkFontConfigInterface_direct.cpp @@ -32,7 +32,7 @@ namespace { // Fontconfig is not threadsafe before 2.10.91. Before that, we lock with a global mutex. // See https://bug.skia.org/1497 for background. -static SkMutex gFCMutex; +SK_DECLARE_STATIC_MUTEX(gFCMutex); #ifdef SK_DEBUG void* CreateThreadFcLocked() { return new bool(false); } -- cgit v1.2.3