Index: src/ports/SkFontHost_mac.cpp |
=================================================================== |
--- src/ports/SkFontHost_mac.cpp (revision 12201) |
+++ src/ports/SkFontHost_mac.cpp (working copy) |
@@ -467,7 +467,6 @@ |
virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[], |
int glyphCount) const SK_OVERRIDE; |
virtual int onCountGlyphs() const SK_OVERRIDE; |
- virtual SkTypeface* onRefMatchingStyle(Style) const SK_OVERRIDE; |
private: |
@@ -633,10 +632,6 @@ |
return face; |
} |
-SkTypeface* SkTypeface_Mac::onRefMatchingStyle(Style styleBits) const { |
- return create_typeface(this, NULL, styleBits); |
-} |
- |
/////////////////////////////////////////////////////////////////////////////// |
/** GlyphRect is in FUnits (em space, y up). */ |
@@ -2315,32 +2310,6 @@ |
/////////////////////////////////////////////////////////////////////////////// |
-#ifndef SK_FONTHOST_USES_FONTMGR |
- |
-SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace, |
- const char familyName[], |
- SkTypeface::Style style) { |
- return create_typeface(familyFace, familyName, style); |
-} |
- |
-SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { |
- AutoCFRelease<CGDataProviderRef> provider(SkCreateDataProviderFromStream(stream)); |
- if (NULL == provider) { |
- return NULL; |
- } |
- return create_from_dataProvider(provider); |
-} |
- |
-SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { |
- AutoCFRelease<CGDataProviderRef> provider(CGDataProviderCreateWithFilename(path)); |
- if (NULL == provider) { |
- return NULL; |
- } |
- return create_from_dataProvider(provider); |
-} |
- |
-#endif |
- |
SkFontMgr* SkFontMgr::Factory() { |
return SkNEW(SkFontMgr_Mac); |
} |