diff options
| author |  bungeman <bungeman@google.com> | 2016-04-13 05:23:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-13 05:23:35 -0700 |
| commit | ed2edabd07086bbf60df17ca0bf52d8ba49f2273 (patch) | |
| tree | d14257caf9d2775bcff4132eb8195d68a7d07576 /include | |
| parent | dada4dd9cf03e42369ca5b38086dba77f01a68e6 (diff) | |
Remove SK_VERY_LEGACY_CREATE_TYPEFACE.
The flag and code it guards are no longer used.
TBR=reed
This just removes dead code.
Review URL: https://codereview.chromium.org/1882803002
Diffstat (limited to 'include')
| -rw-r--r-- | include/ports/SkFontConfigInterface.h | 8 | ||||
| -rw-r--r-- | include/ports/SkFontMgr.h | 9 | ||||
| -rw-r--r-- | include/ports/SkFontMgr_indirect.h | 4 |
3 files changed, 0 insertions, 21 deletions
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h index 464251bc2d..3c68a242e5 100644 --- a/include/ports/SkFontConfigInterface.h +++ b/include/ports/SkFontConfigInterface.h @@ -80,19 +80,11 @@ public: * * If a match is not found, return false, and ignore all out parameters. */ -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE - virtual bool matchFamilyName(const char familyName[], - SkTypeface::Style requested, - FontIdentity* outFontIdentifier, - SkString* outFamilyName, - SkTypeface::Style* outStyle) = 0; -#else virtual bool matchFamilyName(const char familyName[], SkFontStyle requested, FontIdentity* outFontIdentifier, SkString* outFamilyName, SkFontStyle* outStyle) = 0; -#endif /** * Given a FontRef, open a stream to access its data, or return null diff --git a/include/ports/SkFontMgr.h b/include/ports/SkFontMgr.h index a961cd48ad..ad6ed545d9 100644 --- a/include/ports/SkFontMgr.h +++ b/include/ports/SkFontMgr.h @@ -164,11 +164,7 @@ public: */ SkTypeface* createFromFile(const char path[], int ttcIndex = 0) const; -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE - SkTypeface* legacyCreateTypeface(const char familyName[], unsigned typefaceStyleBits) const; -#else SkTypeface* legacyCreateTypeface(const char familyName[], SkFontStyle style) const; -#endif /** * Return a ref to the default fontmgr. The caller must call unref() on @@ -199,12 +195,7 @@ protected: virtual SkTypeface* onCreateFromFontData(SkFontData*) const; virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const = 0; -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE - virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], - unsigned styleBits) const = 0; -#else virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle) const = 0; -#endif private: static SkFontMgr* Factory(); // implemented by porting layer diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index b3f31c3b8e..5e8f1ede70 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -54,11 +54,7 @@ protected: SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override; SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override; -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE - SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) const override; -#else SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle) const override; -#endif private: SkTypeface* createTypefaceFromFontId(const SkFontIdentity& fontId) const; |