From ee6a9919a362e16c1d84a870ce867d1ad7b8a141 Mon Sep 17 00:00:00 2001 From: mboc Date: Tue, 31 May 2016 11:42:36 -0700 Subject: 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 --- samplecode/SampleSlides.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'samplecode/SampleSlides.cpp') diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index edc2dd77a2..5858d2674e 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -625,7 +625,8 @@ static void texteffect_slide(SkCanvas* canvas) { 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); -- cgit v1.2.3