Remove SK_FONTHOST_USES_FONTMGR.

src/core/SkFontHost.cpp

 /*
  * Copyright 2009 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 "SkFontLCDConfig.h"
+#include "SkOnce.h"
 
 static SkFontLCDConfig::LCDOrientation gLCDOrientation = SkFontLCDConfig::kHorizontal_LCDOrientation;
 static SkFontLCDConfig::LCDOrder gLCDOrder = SkFontLCDConfig::kRGB_LCDOrder;
 
 SkFontLCDConfig::LCDOrientation SkFontLCDConfig::GetSubpixelOrientation() {
     return gLCDOrientation;
 }
 
 void SkFontLCDConfig::SetSubpixelOrientation(LCDOrientation orientation) {
     gLCDOrientation = orientation;
@@ skipping 164 matching lines @@
         return NULL;
     }
     return this->onCreateFromFile(path, ttcIndex);
 }
 
 SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[],
                                             unsigned styleBits) {
     return this->onLegacyCreateTypeface(familyName, styleBits);
 }
 
+void set_up_default(SkFontMgr** singleton) {
+  *singleton = SkFontMgr::Factory();
+}
+
 SkFontMgr* SkFontMgr::RefDefault() {
-    static SkFontMgr* gFM;
-    if (NULL == gFM) {
-        gFM = SkFontMgr::Factory();
-        // we never want to return NULL
-        if (NULL == gFM) {
-            gFM = SkNEW(SkEmptyFontMgr);
-        }
-    }
+    static SkFontMgr* gFM = NULL;
+    SK_DECLARE_STATIC_ONCE(once);
+    SkOnce(&once, set_up_default, &gFM);
     return SkRef(gFM);
 }
 
 //////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_FONTHOST_USES_FONTMGR
-
 #if 0
 static SkFontStyle TypefaceStyleBitsToFontStyle(SkTypeface::Style styleBits) {
     SkFontStyle::Weight weight = (styleBits & SkTypeface::kBold) ?
                                      SkFontStyle::kBold_Weight :
                                      SkFontStyle::kNormal_Weight;
     SkFontStyle::Width width = SkFontStyle::kNormal_Width;
     SkFontStyle::Slant slant = (styleBits & SkTypeface::kItalic) ?
                                      SkFontStyle::kUpright_Slant :
                                      SkFontStyle::kItalic_Slant;
     return SkFontStyle(weight, width, slant);
 }
 #endif
 
 SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
                                        const char familyName[],
                                        SkTypeface::Style style) {
+    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
     if (familyFace) {
-        return familyFace->refMatchingStyle(style);
+        bool bold = style & SkTypeface::kBold;
+        bool italic = style & SkTypeface::kItalic;
+        SkFontStyle newStyle = SkFontStyle(bold ? SkFontStyle::kBold_Weight
+                                                : SkFontStyle::kNormal_Weight,
+                                           SkFontStyle::kNormal_Width,
+                                           italic ? SkFontStyle::kItalic_Slant
+                                                  : SkFontStyle::kUpright_Slant);
+        return fm->matchFaceStyle(familyFace, newStyle);
     } else {
-        SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
         return fm->legacyCreateTypeface(familyName, style);
     }
 }
 
 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
     SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
     return fm->createFromFile(path);
 }
 
 SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
     SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
     return fm->createFromStream(stream);
 }
-
-#endif