| Index: src/core/SkFontHost.cpp
|
| diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp
|
| index a16a8c42e02956274090876e842f6a5c3c68e3a2..a4055a1d8a10a1cbd57cbb54a74a98711a33d017 100644
|
| --- a/src/core/SkFontHost.cpp
|
| +++ b/src/core/SkFontHost.cpp
|
| @@ -210,21 +210,6 @@ SkFontMgr* SkFontMgr::RefDefault() {
|
|
|
| //////////////////////////////////////////////////////////////////////////
|
|
|
| -#ifndef SK_FONTHOST_DOES_NOT_USE_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) {
|
| @@ -252,5 +237,3 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
|
| SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
|
| return fm->createFromStream(stream);
|
| }
|
| -
|
| -#endif
|
|
|