aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/FontMgrAndroidParserTest.cpp
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-02-17 18:38:52 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-17 18:39:09 +0000
commit7d07d4663822c05e421f1f50460a985ab43adac4 (patch)
tree708aca529955646b35468d4364dd75517765ad9a /tests/FontMgrAndroidParserTest.cpp
parent87e7f820f74a990a59fb8f1d5c182584ce586ecf (diff)
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 <bungeman@google.com> > Reviewed-by: Mike Reed <reed@google.com> > 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 <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'tests/FontMgrAndroidParserTest.cpp')
-rw-r--r--tests/FontMgrAndroidParserTest.cpp12
1 files changed, 6 insertions, 6 deletions
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<FontFamily*> 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");
}