From f6c7107d0385cc2b556802354b93b7dcff61570d Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 21 Jan 2016 14:17:47 -0800 Subject: Expose API for gx font variation axes. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1590223003 Review URL: https://codereview.chromium.org/1590223003 --- gm/fontscalerdistortable.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gm/fontscalerdistortable.cpp') diff --git a/gm/fontscalerdistortable.cpp b/gm/fontscalerdistortable.cpp index a207f967fd..f83365bb3e 100644 --- a/gm/fontscalerdistortable.cpp +++ b/gm/fontscalerdistortable.cpp @@ -41,6 +41,7 @@ protected: SkPaint paint; paint.setAntiAlias(true); paint.setLCDRenderText(true); + SkAutoTUnref fontMgr(SkFontMgr::RefDefault()); SkAutoTDelete distortable(GetResourceAsStream("/fonts/Distortable.ttf")); if (!distortable) { @@ -54,9 +55,11 @@ protected: SkScalar x = SkIntToScalar(10); SkScalar y = SkIntToScalar(20); - SkFixed axis = SkDoubleToFixed(0.5 + (5*j + i) * ((2.0 - 0.5) / (2 * 5))); - SkAutoTUnref typeface(SkTypeface::CreateFromFontData( - new SkFontData(distortable->duplicate(), 0, &axis, 1))); + SkFourByteTag tag = SkSetFourByteTag('w','g','h','t'); + SkScalar styleValue = SkDoubleToScalar(0.5 + (5*j + i) * ((2.0 - 0.5) / (2 * 5))); + SkFontMgr::FontParameters::Axis axes[] = { { tag, styleValue } }; + SkAutoTUnref typeface(fontMgr->createFromStream( + distortable->duplicate(), SkFontMgr::FontParameters().setAxes(axes, 1))); paint.setTypeface(typeface); SkAutoCanvasRestore acr(canvas, true); -- cgit v1.2.3