| Index: src/ports/SkFontHost_FreeType_common.h
|
| diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
|
| index 21e7748662822aa5838c0d776147bb8fc40ac33b..6b50af27ab3acbdd3d62e520ec63c7ae68b4b28d 100644
|
| --- a/src/ports/SkFontHost_FreeType_common.h
|
| +++ b/src/ports/SkFontHost_FreeType_common.h
|
| @@ -53,8 +53,8 @@
|
| SkFixed fMaximum;
|
| };
|
| using AxisDefinitions = SkSTArray<4, AxisDefinition, true>;
|
| - bool recognizedFont(SkStreamAsset* stream, int* numFonts) const;
|
| - bool scanFont(SkStreamAsset* stream, int ttcIndex,
|
| + bool recognizedFont(SkStream* stream, int* numFonts) const;
|
| + bool scanFont(SkStream* stream, int ttcIndex,
|
| SkString* name, SkFontStyle* style, bool* isFixedPitch,
|
| AxisDefinitions* axes) const;
|
| static void computeAxisValues(
|
| @@ -64,7 +64,7 @@
|
| const SkString& name);
|
|
|
| private:
|
| - FT_Face openFace(SkStreamAsset* stream, int ttcIndex, FT_Stream ftStream) const;
|
| + FT_Face openFace(SkStream* stream, int ttcIndex, FT_Stream ftStream) const;
|
| FT_Library fLibrary;
|
| mutable SkMutex fLibraryMutex;
|
| };
|
|
|