From 7d07d4663822c05e421f1f50460a985ab43adac4 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Fri, 17 Feb 2017 18:38:52 +0000 Subject: Revert "Add SkTypeface::getVariationDesignPosition." This reverts commit 87e7f820f74a990a59fb8f1d5c182584ce586ecf. Reason for revert: Failed a test on Mac Original change's description: > Add SkTypeface::getVariationDesignPosition. > > Allow users to query a typeface's position in variation design space. > > Change-Id: I5d80c8ff658708a5d1aa386ec5b7396dcb621198 > Reviewed-on: https://skia-review.googlesource.com/7130 > Commit-Queue: Ben Wagner > Reviewed-by: Mike Reed > TBR=bungeman@google.com,reed@google.com,reviews@skia.org,drott@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ia65792083642dbe9333a62eb75d162931b57cffd Reviewed-on: https://skia-review.googlesource.com/8670 Reviewed-by: Ben Wagner Commit-Queue: Ben Wagner --- gm/fontscalerdistortable.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gm/fontscalerdistortable.cpp') diff --git a/gm/fontscalerdistortable.cpp b/gm/fontscalerdistortable.cpp index 1823b50efa..c557ec573d 100644 --- a/gm/fontscalerdistortable.cpp +++ b/gm/fontscalerdistortable.cpp @@ -49,12 +49,9 @@ protected: SkFourByteTag tag = SkSetFourByteTag('w','g','h','t'); SkScalar styleValue = SkDoubleToScalar(0.5 + (5*j + i) * ((2.0 - 0.5) / (2 * 5))); - SkFontArguments::VariationPosition::Coordinate coordinates[] = {{tag, styleValue}}; - SkFontArguments::VariationPosition position = - { coordinates, SK_ARRAY_COUNT(coordinates) }; + SkFontMgr::FontParameters::Axis axes[] = { { tag, styleValue } }; paint.setTypeface(sk_sp(fontMgr->createFromStream( - distortable->duplicate(), - SkFontArguments().setVariationDesignPosition(position)))); + distortable->duplicate(), SkFontMgr::FontParameters().setAxes(axes, 1)))); SkAutoCanvasRestore acr(canvas, true); canvas->translate(SkIntToScalar(30 + i * 100), SkIntToScalar(20)); -- cgit v1.2.3