Remove a layer of indirection and code from SkFontHost.

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 "SkLazyPtr.h"
 
@@ skipping 189 matching lines @@
 
 SkFontMgr* SkFontMgr::CreateDefault() {
     SkFontMgr* fm = SkFontMgr::Factory();
     return fm ? fm : SkNEW(SkEmptyFontMgr);
 }
 
 SkFontMgr* SkFontMgr::RefDefault() {
     SK_DECLARE_STATIC_LAZY_PTR(SkFontMgr, singleton, CreateDefault);
     return SkRef(singleton.get());
 }
-
-//////////////////////////////////////////////////////////////////////////
-
-SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
-                                       const char familyName[],
-                                       SkTypeface::Style style) {
-    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
-    if (familyFace) {
-        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 {
-        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);
-}