Index: src/ports/SkFontHost_fontconfig.cpp |
diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp |
index 6f24afc57399e38a66daeef59cff2ba4b94d7d5b..b1a512b0ce3ed91a446a3995403a6ec699478a72 100644 |
--- a/src/ports/SkFontHost_fontconfig.cpp |
+++ b/src/ports/SkFontHost_fontconfig.cpp |
@@ -120,45 +120,6 @@ SkTypeface* FontConfigTypeface::LegacyCreateTypeface( |
return face; |
} |
-#ifdef SK_FONTHOST_DOES_NOT_USE_FONTMGR |
- |
-SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace, |
- const char familyName[], |
- SkTypeface::Style style) { |
- return FontConfigTypeface::LegacyCreateTypeface(familyFace, familyName, |
- style); |
-} |
- |
-SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { |
- if (!stream) { |
- return NULL; |
- } |
- const size_t length = stream->getLength(); |
- if (!length) { |
- return NULL; |
- } |
- if (length >= 1024 * 1024 * 1024) { |
- return NULL; // don't accept too large fonts (>= 1GB) for safety. |
- } |
- |
- // ask freetype for reported style and if it is a fixed width font |
- SkTypeface::Style style = SkTypeface::kNormal; |
- bool isFixedWidth = false; |
- if (!SkTypeface_FreeType::ScanFont(stream, 0, NULL, &style, &isFixedWidth)) { |
- return NULL; |
- } |
- |
- SkTypeface* face = SkNEW_ARGS(FontConfigTypeface, (style, isFixedWidth, stream)); |
- return face; |
-} |
- |
-SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { |
- SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); |
- return stream.get() ? CreateTypefaceFromStream(stream) : NULL; |
-} |
- |
-#endif |
- |
/////////////////////////////////////////////////////////////////////////////// |
SkStream* FontConfigTypeface::onOpenStream(int* ttcIndex) const { |