diff options
| author |  mboc <mboc@opera.com> | 2016-05-31 11:42:36 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-31 11:42:37 -0700 |
| commit | ee6a9919a362e16c1d84a870ce867d1ad7b8a141 (patch) | |
| tree | 971189523fe82821c82a936cafaefd59b76338f7 /gm/texteffects.cpp | |
| parent | bfa9275968d11d459b30a485cedcb55c7fecf9d7 (diff) | |
SkTypeface::MakeFromName to take SkFontStyle.
SkTypeface::MakeFromName currently takes SkTypeface::Style,
which is quite limited. This starts the transition to this
function taking SkFontStyle instead.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1818043002
TBR=reed
He said it sounded like a good idea.
Review-Url: https://codereview.chromium.org/1818043002
Diffstat (limited to 'gm/texteffects.cpp')
| -rw-r--r-- | gm/texteffects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp index a398ae2e68..e199594004 100644 --- a/gm/texteffects.cpp +++ b/gm/texteffects.cpp @@ -268,7 +268,7 @@ DEF_SIMPLE_GM(fancyunderline, canvas, 900, 1350) { const char test[] = "aAjJgGyY_|{-(~[,]qQ}pP}zZ"; SkPoint textPt = { 10, 80 }; for (int font = 0; font < 3; ++font) { - sk_tool_utils::set_portable_typeface(&paint, fam[font], SkTypeface::kNormal); + sk_tool_utils::set_portable_typeface(&paint, fam[font]); for (SkScalar textSize = 100; textSize > 10; textSize -= 20) { paint.setTextSize(textSize); const SkScalar uWidth = textSize / 15; @@ -312,7 +312,7 @@ DEF_SIMPLE_GM(fancyposunderline, canvas, 900, 1350) { const char test[] = "aAjJgGyY_|{-(~[,]qQ}pP}zZ"; SkPoint textPt = { 10, 80 }; for (int font = 0; font < 3; ++font) { - sk_tool_utils::set_portable_typeface(&paint, fam[font], SkTypeface::kNormal); + sk_tool_utils::set_portable_typeface(&paint, fam[font]); for (SkScalar textSize = 100; textSize > 10; textSize -= 20) { paint.setTextSize(textSize); const SkScalar uWidth = textSize / 15; |