| commit | ee6a9919a362e16c1d84a870ce867d1ad7b8a141 | [log] [tgz] |
|---|---|---|
| author | mboc <mboc@opera.com> | Tue May 31 11:42:36 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Tue May 31 11:42:37 2016 -0700 |
| tree | 971189523fe82821c82a936cafaefd59b76338f7 | |
| parent | bfa9275968d11d459b30a485cedcb55c7fecf9d7 [diff] [blame] |
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
diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index edc2dd7..5858d26 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp
@@ -625,7 +625,8 @@ SkScalar x = 20; SkScalar y = 80; SkPaint paint; - paint.setTypeface(SkTypeface::MakeFromName("Georgia", SkTypeface::kItalic)); + paint.setTypeface(SkTypeface::MakeFromName("Georgia", + SkFontStyle::FromOldStyle(SkTypeface::kItalic))); paint.setTextSize(75); paint.setAntiAlias(true); paint.setColor(SK_ColorBLUE);