| Index: src/ports/SkFontHost_FreeType_common.h
|
| diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
|
| index 857d2c89906655946986880fced4ec8ad9a4e4ef..8ae872c1dac58130894f93c2cb5c5103d9e72f96 100644
|
| --- a/src/ports/SkFontHost_FreeType_common.h
|
| +++ b/src/ports/SkFontHost_FreeType_common.h
|
| @@ -43,9 +43,17 @@ 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) const;
|
| + SkString* name, SkFontStyle* style, bool* isFixedPitch,
|
| + AxisDefinitions* axes) const;
|
| private:
|
| FT_Face openFace(SkStream* stream, int ttcIndex, FT_Stream ftStream) const;
|
| FT_Library fLibrary;
|
|
|