diff options
author | Mike Klein <mtklein@chromium.org> | 2017-11-14 10:45:32 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-14 18:45:04 +0000 |
commit | cb9fc4160ea95453cb37134d4477c63d512458cc (patch) | |
tree | 9f8ae3cf1448b1aadf0490a6de225a7256cc1d33 /gm/typeface.cpp | |
parent | 9592817042c411accbfa37ad736b139f9af9c976 (diff) |
remove platform_font_name()
It's used rarely and now that we're mostly using portable fonts,
it only serves to confuse. Sans-serif doesn't seem to work anyway.
Simplify gm/typeface.cpp to just test the default typeface.
Change-Id: I091239ea91af9d9e01d3c76280636a6061b5fb5c
Reviewed-on: https://skia-review.googlesource.com/71261
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gm/typeface.cpp')
-rw-r--r-- | gm/typeface.cpp | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/gm/typeface.cpp b/gm/typeface.cpp index 8ac41c5786..aa90a8486f 100644 --- a/gm/typeface.cpp +++ b/gm/typeface.cpp @@ -73,28 +73,17 @@ static void drawKernText(SkCanvas* canvas, const void* text, size_t len, canvas->drawPosText(glyphs, glyphCount * sizeof(uint16_t), pos, glyphPaint); } -constexpr struct { - const char* fName; - SkFontStyle fStyle; -} gFaceStyles[] = { - { "sans-serif", SkFontStyle::Normal() }, - { "sans-serif", SkFontStyle::Bold() }, - { "sans-serif", SkFontStyle::Italic() }, - { "sans-serif", SkFontStyle::BoldItalic() }, - { "serif", SkFontStyle::Normal() }, - { "serif", SkFontStyle::Bold() }, - { "serif", SkFontStyle::Italic() }, - { "serif", SkFontStyle::BoldItalic() }, - { "monospace", SkFontStyle::Normal() }, - { "monospace", SkFontStyle::Bold() }, - { "monospace", SkFontStyle::Italic() }, - { "monospace", SkFontStyle::BoldItalic() }, +static constexpr SkFontStyle gStyles[] = { + SkFontStyle::Normal(), + SkFontStyle::Bold(), + SkFontStyle::Italic(), + SkFontStyle::BoldItalic(), }; -constexpr int gFaceStylesCount = SK_ARRAY_COUNT(gFaceStyles); +constexpr int gStylesCount = SK_ARRAY_COUNT(gStyles); class TypefaceStylesGM : public skiagm::GM { - sk_sp<SkTypeface> fFaces[gFaceStylesCount]; + sk_sp<SkTypeface> fFaces[gStylesCount]; bool fApplyKerning; public: @@ -105,9 +94,8 @@ public: protected: void onOnceBeforeDraw() override { - for (int i = 0; i < gFaceStylesCount; i++) { - fFaces[i] = SkTypeface::MakeFromName( - sk_tool_utils::platform_font_name(gFaceStyles[i].fName), gFaceStyles[i].fStyle); + for (int i = 0; i < gStylesCount; i++) { + fFaces[i] = SkTypeface::MakeFromName(nullptr, gStyles[i]); } } @@ -141,7 +129,7 @@ protected: } else { paint.setLinearText(true); } - for (int i = 0; i < gFaceStylesCount; i++) { + for (int i = 0; i < gStylesCount; i++) { paint.setTypeface(fFaces[i]); canvas->drawText(text, textLen, x, y, paint); if (fApplyKerning) { |