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/verttext.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/verttext.cpp')
-rw-r--r-- | gm/verttext.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gm/verttext.cpp b/gm/verttext.cpp index 9c9ddb0e11..c729271c05 100644 --- a/gm/verttext.cpp +++ b/gm/verttext.cpp @@ -28,20 +28,20 @@ constexpr size_t gLen = sizeof(gText) - sizeof(gText[0]); class VertTextGM : public GM { public: VertTextGM() - // : fFace(SkTypeface::CreateFromName("unifont", SkTypeface::kNormal)) - // : fFace(SkTypeface::CreateFromFile("MotoyaL04Mincho_3.ttf")) + // : fFace(SkTypeface::MakeFromName("unifont", SkFontStyle::Normal())) + // : fFace(SkTypeface::MakeFromFile("MotoyaL04Mincho_3.ttf")) // Bitmap fonts on OS X. - // : fFace(SkTypeface::CreateFromName("GB18030 Bitmap", SkTypeface::kNormal)) - // : fFace(SkTypeface::CreateFromName("Apple Color Emoji", SkTypeface::kNormal)) + // : fFace(SkTypeface::MakeFromName("GB18030 Bitmap", SkFontStyle::Normal())) + // : fFace(SkTypeface::MakeFromName("Apple Color Emoji", SkFontStyle::Normal())) // OTF CFF fonts on OS X. - // : fFace(SkTypeface::CreateFromName("Hiragino Mincho ProN", SkTypeface::kNormal)) - // : fFace(SkTypeface::CreateFromName("Hiragino Kaku Gothic Pro", SkTypeface::kNormal)) - // : fFace(SkTypeface::CreateFromName("Hiragino Sans GB", SkTypeface::kNormal)) - // : fFace(SkTypeface::CreateFromName("STIXGeneral", SkTypeface::kNormal)) - // : fFace(SkTypeface::CreateFromName("Yuppy SC", SkTypeface::kNormal)) - // : fFace(SkTypeface::CreateFromName("Yuppy TC", SkTypeface::kNormal)) + // : fFace(SkTypeface::MakeFromName("Hiragino Mincho ProN", SkFontStyle::Normal())) + // : fFace(SkTypeface::MakeFromName("Hiragino Kaku Gothic Pro", SkFontStyle::Normal())) + // : fFace(SkTypeface::MakeFromName("Hiragino Sans GB", SkFontStyle::Normal())) + // : fFace(SkTypeface::MakeFromName("STIXGeneral", SkFontStyle::Normal())) + // : fFace(SkTypeface::MakeFromName("Yuppy SC", SkFontStyle::Normal())) + // : fFace(SkTypeface::MakeFromName("Yuppy TC", SkFontStyle::Normal())) { } |