diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-11 15:53:29 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-11 15:53:29 +0000 |
| commit | b3d154de5e4c318f88e4c4ad15fe626054365997 (patch) | |
| tree | 00a594cee4948ef59e7535073bfb25ad9a68619a /include/core | |
| parent | 247ac53c290c099537b7b07aefd80106612f6ee4 (diff) | |
Remove SK_FONTHOST_USES_FONTMGR.
Review URL: https://codereview.chromium.org/66783003
git-svn-id: http://skia.googlecode.com/svn/trunk@12217 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkFontHost.h | 2 | ||||
| -rw-r--r-- | include/core/SkTypeface.h | 13 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/core/SkFontHost.h b/include/core/SkFontHost.h index e847b76af8..4c5013fe4a 100644 --- a/include/core/SkFontHost.h +++ b/include/core/SkFontHost.h @@ -12,8 +12,6 @@ #include "SkTypeface.h" -//#define SK_FONTHOST_USES_FONTMGR - class SkDescriptor; class SkScalerContext; struct SkScalerContextRec; diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index af76824f47..d873e69b9d 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -281,17 +281,6 @@ public: SkStream* openStream(int* ttcIndex) const; /** - * Search within this typeface's family for a best match to the - * specified style, and return a ref to that typeface. Note: the - * returned object could be this, if it is the best match, or it - * could be a different typeface. Either way, the caller must balance - * this call with unref() on the returned object. - * - * Will never return NULL. - */ - SkTypeface* refMatchingStyle(Style) const; - - /** * Return a scalercontext for the given descriptor. If this fails, then * if allowFailure is true, this returns NULL, else it returns a * dummy scalercontext that will not crash, but will draw nothing. @@ -344,8 +333,6 @@ protected: virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const = 0; - virtual SkTypeface* onRefMatchingStyle(Style styleBits) const = 0; - private: SkFontID fUniqueID; Style fStyle; |