diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-02-23 20:48:43 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-23 20:48:53 +0000 |
| commit | 97043299cb352f50f604878b7a1dc8ad127fc1c6 (patch) | |
| tree | 3363bfc674ab808e735336898386076d9c3b9558 /src/ports/SkFontMgr_android_parser.cpp | |
| parent | 3f81f3703a68755c88f5cc4a87728b98f34c4cd4 (diff) | |
Revert "Add SkTypeface::getVariationDesignPosition."
This reverts commit 0f3d0c37dbcaf4ec271d5fe847becc9b1aa6f537.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Add SkTypeface::getVariationDesignPosition.
>
> Allow users to query a typeface's position in variation design space.
>
> Change-Id: I173ee9eefdddee6b2613435ebcc6b08c25b382ed
> Reviewed-on: https://skia-review.googlesource.com/8684
> 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: I484fe52c1f89e7b6d0024dcabf7c59d0e8b5b5e7
Reviewed-on: https://skia-review.googlesource.com/8929
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/ports/SkFontMgr_android_parser.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_android_parser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp index e50a73946a..e5fdcd0dbf 100644 --- a/src/ports/SkFontMgr_android_parser.cpp +++ b/src/ports/SkFontMgr_android_parser.cpp @@ -167,8 +167,8 @@ static const TagHandler axisHandler = { if (valueLen == 4) { axisTag = SkSetFourByteTag(value[0], value[1], value[2], value[3]); axisTagIsValid = true; - for (int j = 0; j < file.fVariationDesignPosition.count() - 1; ++j) { - if (file.fVariationDesignPosition[j].axis == axisTag) { + for (int j = 0; j < file.fAxes.count() - 1; ++j) { + if (file.fAxes[j].fTag == axisTag) { axisTagIsValid = false; SK_FONTCONFIGPARSER_WARNING("'%c%c%c%c' axis specified more than once", (axisTag >> 24) & 0xFF, @@ -189,9 +189,9 @@ static const TagHandler axisHandler = { } } if (axisTagIsValid && axisStyleValueIsValid) { - auto& coordinate = file.fVariationDesignPosition.push_back(); - coordinate.axis = axisTag; - coordinate.value = SkFixedToScalar(axisStyleValue); + SkFontMgr::FontParameters::Axis& axis = file.fAxes.push_back(); + axis.fTag = axisTag; + axis.fStyleValue = SkFixedToScalar(axisStyleValue); } }, /*end*/nullptr, |