fix refcnts for singleton fontconfig-direct

git-svn-id: http://skia.googlecode.com/svn/trunk@8807 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
index 1dcf932..d4bb3e6 100644 (file)
--- a/src/ports/SkFontConfigInterface_direct.cpp
+++ b/src/ports/SkFontConfigInterface_direct.cpp
@@ -41,7 +41,12 @@ private:
 SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface() {
     static SkFontConfigInterface* gDirect;
     if (NULL == gDirect) {
-        gDirect = new SkFontConfigInterfaceDirect;
+        static SkMutex gMutex;
+        SkAutoMutexAcquire ac(gMutex);
+
+        if (NULL == gDirect) {
+            gDirect = new SkFontConfigInterfaceDirect;
+        }
     }
     return gDirect;
 }

diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index 9a0f654..0092ebd 100644 (file)
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -43,7 +43,7 @@ static SkFontConfigInterface* RefFCI() {
             return fci;
         }
         fci = SkFontConfigInterface::GetSingletonDirectInterface();
-        SkFontConfigInterface::SetGlobal(fci)->unref();
+        SkFontConfigInterface::SetGlobal(fci);
     }
 }