Revert of SK_DECLARE_STATIC_MUTEX -> static SkMutex

src/core/SkTypefaceCache.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #include "SkTypefaceCache.h"
@@ skipping 46 matching lines @@
 SkTypefaceCache& SkTypefaceCache::Get() {
     static SkTypefaceCache gCache;
     return gCache;
 }
 
 SkFontID SkTypefaceCache::NewFontID() {
     static int32_t gFontID;
     return sk_atomic_inc(&gFontID) + 1;
 }
 
-static SkMutex gMutex;
+SK_DECLARE_STATIC_MUTEX(gMutex);
 
 void SkTypefaceCache::Add(SkTypeface* face) {
     SkAutoMutexAcquire ama(gMutex);
     Get().add(face);
 }
 
 SkTypeface* SkTypefaceCache::FindByProcAndRef(FindProc proc, void* ctx) {
     SkAutoMutexAcquire ama(gMutex);
     return Get().findByProcAndRef(proc, ctx);
 }
@@ skipping 15 matching lines @@
              face, id, s.weight(), s.width(), s.slant(), face->getRefCnt(), n.c_str());
     return false;
 }
 #endif
 
 void SkTypefaceCache::Dump() {
 #ifdef SK_DEBUG
     (void)Get().findByProcAndRef(DumpProc, nullptr);
 #endif
 }