diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkFontHost.h | 6 | ||||
| -rw-r--r-- | include/core/SkTypeface.h | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/core/SkFontHost.h b/include/core/SkFontHost.h index 5ae5f203cd..d695aae17e 100644 --- a/include/core/SkFontHost.h +++ b/include/core/SkFontHost.h @@ -120,12 +120,6 @@ public: private: - /** Return a new stream to read the font data, or null if the uniqueID does - not match an existing typeface. .The caller must call stream->unref() - when it is finished reading the data. - */ - static SkStream* OpenStream(SkFontID uniqueID); - /** Return a new, closest matching typeface given either an existing family (specified by a typeface in that family) or by a familyName and a requested style. diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index a89c31f0f5..8eedc50b3b 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -213,13 +213,11 @@ protected: virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const = 0; virtual void onFilterRec(SkScalerContextRec*) const = 0; - virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo, const uint32_t* glyphIDs, uint32_t glyphIDsCount) const = 0; - // TODO: remove SkFontHost::OpenStream and make this guy pure-virtual - virtual SkStream* onOpenStream(int* ttcIndex) const; + virtual SkStream* onOpenStream(int* ttcIndex) const = 0; virtual int onGetUPEM() const; |