aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontHost_linux.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ports/SkFontHost_linux.cpp')
-rw-r--r--src/ports/SkFontHost_linux.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp
index 8825919a98..71438986e6 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"