| Index: src/ports/SkFontHost_FreeType_common.h
|
| diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
|
| index 36efba011d7b7c05f76ef529456dd8c968233059..94739ad6e34c74437eed599fe68b1bcf2dcddac5 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;
|
|
|