diff options
| author |  bungeman <bungeman@google.com> | 2016-02-25 11:20:01 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-25 11:20:01 -0800 |
| commit | 47a1e96b957b50662274360f1a390d76ab3d02cc (patch) | |
| tree | 9f0c168c3d7558b3e045b50acb24d56e64abb4d8 /src/ports/SkFontMgr_android_parser.h | |
| parent | 26cc3f5ad0aacf80bba162bab4b23a2901ffed17 (diff) | |
Deduplicate axis value resolving code.
The code was originally written for Android, but is now implemented
more generally by the FreeType scanner to be shared between all
FreeType backed typefaces. This removes the now duplicate code in the
Android font manager and uses the shared code instead.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1726213004
Review URL: https://codereview.chromium.org/1726213004
Diffstat (limited to 'src/ports/SkFontMgr_android_parser.h')
| -rw-r--r-- | src/ports/SkFontMgr_android_parser.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/ports/SkFontMgr_android_parser.h b/src/ports/SkFontMgr_android_parser.h index b841bc6d18..efd8144f14 100644 --- a/src/ports/SkFontMgr_android_parser.h +++ b/src/ports/SkFontMgr_android_parser.h @@ -8,7 +8,7 @@ #ifndef SkFontMgr_android_parser_DEFINED #define SkFontMgr_android_parser_DEFINED -#include "SkFixed.h" +#include "SkFontMgr.h" #include "SkString.h" #include "SkTArray.h" #include "SkTDArray.h" @@ -73,12 +73,7 @@ struct FontFileInfo { int fIndex; int fWeight; enum class Style { kAuto, kNormal, kItalic } fStyle; - struct Axis { - Axis() : fTag(SkSetFourByteTag('\0','\0','\0','\0')), fValue(0) { } - SkFourByteTag fTag; - SkFixed fValue; - }; - SkTArray<Axis, true> fAxes; + SkTArray<SkFontMgr::FontParameters::Axis, true> fAxes; }; /** |