diff options
| author |  bungeman <bungeman@google.com> | 2016-01-21 14:17:47 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-21 14:17:47 -0800 |
| commit | f6c7107d0385cc2b556802354b93b7dcff61570d (patch) | |
| tree | 6acc6e0ae4621e2bbc6deb43c3198a73c5d56433 /gm/fontscalerdistortable.cpp | |
| parent | 27a6e86fb17fce7ce962b9080eae36926e87d568 (diff) | |
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
Diffstat (limited to 'gm/fontscalerdistortable.cpp')
| -rw-r--r-- | gm/fontscalerdistortable.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
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<SkFontMgr> fontMgr(SkFontMgr::RefDefault()); SkAutoTDelete<SkStreamAsset> 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<SkTypeface> 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<SkTypeface> typeface(fontMgr->createFromStream( + distortable->duplicate(), SkFontMgr::FontParameters().setAxes(axes, 1))); paint.setTypeface(typeface); SkAutoCanvasRestore acr(canvas, true); |