aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-22 17:21:59 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-22 17:21:59 +0000
commit292b1d4903a770a77282508054917b48fb989d49 (patch)
tree38a7beeb3d682f047cda1b798f76e52eb9c7e6f0 /include
parentcb693198e7e1d2f8318b2455c52210e6e1ea13e3 (diff)
remove SkFontHost::OpenStream(), now subsumed by SkTypeface::openStream()
remove obsolete/abandoned SkFontHost_freetype_mac.cpp Review URL: https://codereview.chromium.org/13008019 git-svn-id: http://skia.googlecode.com/svn/trunk@8342 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/core/SkFontHost.h6
-rw-r--r--include/core/SkTypeface.h4
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;