Fix thread unsafe mutex initialization.

src/ports/SkFontConfigInterface_android.cpp

 
 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
 #include "SkTypeface_android.h"
@@ skipping 114 matching lines @@
     SkTDict<FallbackFontList*> fFallbackFontAliasDict;
     FallbackFontList fDefaultFallbackList;
 
     // fallback info for current locale
     SkString fCachedLocale;
     FallbackFontList* fLocaleFallbackFontList;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
+SK_DECLARE_STATIC_MUTEX(gGetSingletonInterfaceMutex);
 static SkFontConfigInterfaceAndroid* getSingletonInterface() {
-    SK_DECLARE_STATIC_MUTEX(gMutex);
     static SkFontConfigInterfaceAndroid* gFontConfigInterface;
 
-    SkAutoMutexAcquire ac(gMutex);
+    SkAutoMutexAcquire ac(gGetSingletonInterfaceMutex);
     if (NULL == gFontConfigInterface) {
         // load info from a configuration file that we can use to populate the
         // system/fallback font structures
         SkTDArray<FontFamily*> fontFamilies;
         if (!gTestMainConfigFile) {
             SkFontConfigParser::GetFontFamilies(fontFamilies);
         } else {
             SkFontConfigParser::GetTestFontFamilies(fontFamilies, gTestMainConfigFile,
                                                     gTestFallbackConfigFile);
         }
@@ skipping 750 matching lines @@
         key.typeface = retTypeface;
         *gTypefaceTable.insert(~index) = key;
     }
 
     // we ref(), the caller is expected to unref when they are done
     return SkSafeRef(retTypeface);
 }
 
 #endif