diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-07-10 19:40:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-13 15:01:04 +0000 |
| commit | 83c6b96bcd38702ec8bbe98f5f77f91121102ad9 (patch) | |
| tree | 62f6b918894e7d1865c020bb0828b0250c2062c8 /tools/fonts/create_test_font.cpp | |
| parent | a07bf6788e926c41d52ae4bed592ec8a187ee4ab (diff) | |
Improve SkTestFontMgr.
This moves the portable typefaces into the portable font manager.
Change-Id: Id25e8f0b90f99c82d09cfb3ef136bda8c7728ee9
Reviewed-on: https://skia-review.googlesource.com/140351
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'tools/fonts/create_test_font.cpp')
| -rw-r--r-- | tools/fonts/create_test_font.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/fonts/create_test_font.cpp b/tools/fonts/create_test_font.cpp index 51c56eaee1..6cbcf6e2f8 100644 --- a/tools/fonts/create_test_font.cpp +++ b/tools/fonts/create_test_font.cpp @@ -387,7 +387,7 @@ static void generate_index(const char* defaultName) { fprintf(out, " { %sPoints, %sVerbs, %sCharCodes,\n" " %sCharCodesCount, %sWidths,\n" - " %sMetrics, \"Toy %s\", SkFontStyle(%d,%d,%s), nullptr\n" + " %sMetrics, \"Toy %s\", SkFontStyle(%d,%d,%s)\n" " },\n", strip, strip, strip, strip, strip, strip, name, writ.fNamedStyle.fStyle.weight(), writ.fNamedStyle.fStyle.width(), @@ -397,7 +397,8 @@ static void generate_index(const char* defaultName) { fprintf(out, "const int gTestFontsCount = (int) SK_ARRAY_COUNT(gTestFonts);\n\n"); fprintf(out, "struct SubFont {\n" - " const char* fName;\n" + " const char* fFamilyName;\n" + " const char* fStyleName;\n" " SkFontStyle fStyle;\n" " SkTestFontData& fFont;\n" " const char* fFile;\n" @@ -410,16 +411,16 @@ static void generate_index(const char* defaultName) { defaultIndex = subIndex; } fprintf(out, - " { \"%s\", SkFontStyle(%d,%d,%s), gTestFonts[%d], \"%s\" },\n", - desc.fGenericName, + " { \"%s\", \"%s\", SkFontStyle(%d,%d,%s), gTestFonts[%d], \"%s\" },\n", + desc.fGenericName, desc.fNamedStyle.fName, desc.fNamedStyle.fStyle.weight(), desc.fNamedStyle.fStyle.width(), slant_to_string(desc.fNamedStyle.fStyle.slant()), desc.fFontIndex, desc.fFile); } for (int subIndex = 0; subIndex < gFontsCount; subIndex++) { const FontDesc& desc = gFonts[subIndex]; fprintf(out, - " { \"Toy %s\", SkFontStyle(%d,%d,%s), gTestFonts[%d], \"%s\" },\n", - desc.fFontName, + " { \"Toy %s\", \"%s\", SkFontStyle(%d,%d,%s), gTestFonts[%d], \"%s\" },\n", + desc.fFontName, desc.fNamedStyle.fName, desc.fNamedStyle.fStyle.weight(), desc.fNamedStyle.fStyle.width(), slant_to_string(desc.fNamedStyle.fStyle.slant()), desc.fFontIndex, desc.fFile); } |