diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-07-27 10:45:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-27 21:30:45 +0000 |
| commit | 713195071dc7bdeddec2d1c9fab9b3720f049f07 (patch) | |
| tree | 1bc2d47ec9e66f81a14d626eb5ad8185dbecca27 /gm/typeface.cpp | |
| parent | 23890a9ac89005a15967fe8af8aaafc0edda5e32 (diff) | |
Remove internal use of SkTypeface::Style.
Change-Id: I71cf04b12be95a54b7fb47d048ba1f8672ed9a8f
Reviewed-on: https://skia-review.googlesource.com/27760
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gm/typeface.cpp')
| -rw-r--r-- | gm/typeface.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gm/typeface.cpp b/gm/typeface.cpp index 807b49c883..b0db62b05a 100644 --- a/gm/typeface.cpp +++ b/gm/typeface.cpp @@ -9,6 +9,7 @@ #include "sk_tool_utils.h" #include "Resources.h" #include "SkCanvas.h" +#include "SkFontStyle.h" #include "SkString.h" #include "SkSurfaceProps.h" #include "SkTypeface.h" @@ -74,20 +75,20 @@ static void drawKernText(SkCanvas* canvas, const void* text, size_t len, constexpr struct { const char* fName; - SkTypeface::Style fStyle; + SkFontStyle fStyle; } gFaceStyles[] = { - { "sans-serif", SkTypeface::kNormal }, - { "sans-serif", SkTypeface::kBold }, - { "sans-serif", SkTypeface::kItalic }, - { "sans-serif", SkTypeface::kBoldItalic }, - { "serif", SkTypeface::kNormal }, - { "serif", SkTypeface::kBold }, - { "serif", SkTypeface::kItalic }, - { "serif", SkTypeface::kBoldItalic }, - { "monospace", SkTypeface::kNormal }, - { "monospace", SkTypeface::kBold }, - { "monospace", SkTypeface::kItalic }, - { "monospace", SkTypeface::kBoldItalic }, + { "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() }, }; constexpr int gFaceStylesCount = SK_ARRAY_COUNT(gFaceStyles); @@ -106,8 +107,7 @@ protected: void onOnceBeforeDraw() override { for (int i = 0; i < gFaceStylesCount; i++) { fFaces[i] = SkTypeface::MakeFromName( - sk_tool_utils::platform_font_name( - gFaceStyles[i].fName), SkFontStyle::FromOldStyle(gFaceStyles[i].fStyle)); + sk_tool_utils::platform_font_name(gFaceStyles[i].fName), gFaceStyles[i].fStyle); } } |