Index: src/ports/SkFontHost_linux.cpp |
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp |
index 8825919a987349e3388b07e5946ef5a6f0d678ed..71438986e6db7012a701685c50df73daaa4446ff 100644 |
--- a/src/ports/SkFontHost_linux.cpp |
+++ b/src/ports/SkFontHost_linux.cpp |
@@ -469,6 +469,8 @@ void FamilyTypeface::onGetFontDescriptor(SkFontDescriptor* desc, |
/////////////////////////////////////////////////////////////////////////////// |
+#ifndef SK_FONTHOST_USES_FONTMGR |
+ |
SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace, |
const char familyName[], |
SkTypeface::Style style) { |
@@ -496,8 +498,6 @@ SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace, |
return tf; |
} |
-/////////////////////////////////////////////////////////////////////////////// |
- |
SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { |
if (NULL == stream || stream->getLength() <= 0) { |
SkDELETE(stream); |
@@ -518,6 +518,8 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { |
return stream.get() ? CreateTypefaceFromStream(stream) : NULL; |
} |
+#endif |
+ |
/////////////////////////////////////////////////////////////////////////////// |
#include "SkFontMgr.h" |