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 --- tests/FontMgrAndroidParserTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/FontMgrAndroidParserTest.cpp') diff --git a/tests/FontMgrAndroidParserTest.cpp b/tests/FontMgrAndroidParserTest.cpp index cbcfb3be2a..92dbd951c0 100644 --- a/tests/FontMgrAndroidParserTest.cpp +++ b/tests/FontMgrAndroidParserTest.cpp @@ -90,13 +90,13 @@ void DumpLoadedFonts(SkTDArray fontFamilies, const char* label) { for (int j = 0; j < fontFamilies[i]->fFonts.count(); ++j) { const FontFileInfo& ffi = fontFamilies[i]->fFonts[j]; SkDebugf(" file (%d) %s#%d", ffi.fWeight, ffi.fFileName.c_str(), ffi.fIndex); - for (const auto& coordinate : ffi.fVariationDesignPosition) { + for (const auto& axis : ffi.fAxes) { SkDebugf(" @'%c%c%c%c'=%f", - (coordinate.axis >> 24) & 0xFF, - (coordinate.axis >> 16) & 0xFF, - (coordinate.axis >> 8) & 0xFF, - (coordinate.axis ) & 0xFF, - coordinate.value); + (axis.fTag >> 24) & 0xFF, + (axis.fTag >> 16) & 0xFF, + (axis.fTag >> 8) & 0xFF, + (axis.fTag ) & 0xFF, + axis.fStyleValue); } SkDebugf("\n"); } -- cgit v1.2.3