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/gammatext.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/gammatext.cpp')
| -rw-r--r-- | gm/gammatext.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp index c7d4309f97..8fa5171844 100644 --- a/gm/gammatext.cpp +++ b/gm/gammatext.cpp @@ -19,7 +19,7 @@ static sk_sp<SkShader> make_heatGradient(const SkPoint pts[2]) { } static bool setFont(SkPaint* paint, const char name[]) { - paint->setTypeface(SkTypeface::MakeFromName(name, SkTypeface::kNormal)); + paint->setTypeface(SkTypeface::MakeFromName(name, SkFontStyle())); return SkToBool(paint->getTypeface()); } @@ -104,7 +104,8 @@ static sk_sp<SkShader> make_gradient(SkColor c) { } static void set_face(SkPaint* paint) { - paint->setTypeface(SkTypeface::MakeFromName("serif", SkTypeface::kItalic)); + paint->setTypeface(SkTypeface::MakeFromName("serif", + SkFontStyle::FromOldStyle(SkTypeface::kItalic))); } static void draw_pair(SkCanvas* canvas, SkPaint* paint, const sk_sp<SkShader>& shader) { |