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 /src/ports/SkFontHost_FreeType_common.h | |
| 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 'src/ports/SkFontHost_FreeType_common.h')
| -rw-r--r-- | src/ports/SkFontHost_FreeType_common.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h index 8ae872c1da..857d2c8990 100644 --- a/src/ports/SkFontHost_FreeType_common.h +++ b/src/ports/SkFontHost_FreeType_common.h @@ -43,17 +43,9 @@ public: public: Scanner(); ~Scanner(); - struct AxisDefinition { - SkFourByteTag fTag; - SkFixed fMinimum; - SkFixed fDefault; - SkFixed fMaximum; - }; - using AxisDefinitions = SkSTArray<4, AxisDefinition, true>; bool recognizedFont(SkStream* stream, int* numFonts) const; bool scanFont(SkStream* stream, int ttcIndex, - SkString* name, SkFontStyle* style, bool* isFixedPitch, - AxisDefinitions* axes) const; + SkString* name, SkFontStyle* style, bool* isFixedPitch) const; private: FT_Face openFace(SkStream* stream, int ttcIndex, FT_Stream ftStream) const; FT_Library fLibrary; |