diff options
| author |  bungeman <bungeman@google.com> | 2015-05-13 12:16:41 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-13 12:16:41 -0700 |
| commit | 5ae1312c9faa25531c07e591b4dff6804020f121 (patch) | |
| tree | 5ad34f4f5ddbe8f628d078be9480444d0d883f1d /include/ports | |
| parent | 1573206f202c6d2ffcffab78b17160da95a80466 (diff) | |
Revert of Font variations. (patchset #21 id:400001 of https://codereview.chromium.org/1027373002/)
Reason for revert:
Mac failing to build due to CFNumberType in Chromium Canary.
Original issue's description:
> Font variations.
>
> Multiple Master and TrueType fonts support variation axes.
> This implements back-end support for axes on platforms which
> support it.
>
> Committed: https://skia.googlesource.com/skia/+/05773ed30920c0214d1433c07cf6360a05476c97
TBR=reed@google.com,mtklein@google.com,djsollen@google.com,halcanary@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1128913008
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkFontMgr.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/ports/SkFontMgr.h b/include/ports/SkFontMgr.h index 48a0494a7a..4dde920085 100644 --- a/include/ports/SkFontMgr.h +++ b/include/ports/SkFontMgr.h @@ -12,7 +12,6 @@ #include "SkFontStyle.h" class SkData; -class SkFontData; class SkStreamAsset; class SkString; class SkTypeface; @@ -96,14 +95,6 @@ public: SkTypeface* createFromStream(SkStreamAsset*, int ttcIndex = 0) const; /** - * Create a typeface from the specified font data. - * Takes ownership of the font data, so the caller should not reference it again. - * Will return NULL if the typeface could not be created. - * The caller must call unref() on the returned object if it is not null. - */ - SkTypeface* createFromFontData(SkFontData*) const; - - /** * Create a typeface for the specified fileName and TTC index * (pass 0 for none) or NULL if the file is not found, or its contents are * not recognized. The caller must call unref() on the returned object @@ -138,8 +129,6 @@ protected: virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) const = 0; virtual SkTypeface* onCreateFromStream(SkStreamAsset*, int ttcIndex) const = 0; - // TODO: make pure virtual. - virtual SkTypeface* onCreateFromFontData(SkFontData*) const; virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const = 0; virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], |