diff options
| author |  bungeman <bungeman@google.com> | 2016-07-25 15:11:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-25 15:11:49 -0700 |
| commit | 6e45bda29edef867468cbdd7c062d0d99e884656 (patch) | |
| tree | 7902ff9ad3fdcb1c9417eaafdca60a4caae5a8b0 /src/ports/SkFontMgr_fontconfig.cpp | |
| parent | 4e90e3eb5e43ffa8f347570578f5a538793b0cc7 (diff) | |
Add test for typeface style round trip.
This also fixes the CG and GDI ports so they pass the test.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2171163002
Review-Url: https://codereview.chromium.org/2171163002
Diffstat (limited to 'src/ports/SkFontMgr_fontconfig.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_fontconfig.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp index 0876fb6325..d4d873744f 100644 --- a/src/ports/SkFontMgr_fontconfig.cpp +++ b/src/ports/SkFontMgr_fontconfig.cpp @@ -326,7 +326,7 @@ static SkFontStyle skfontstyle_from_fcpattern(FcPattern* pattern) { { SkTFixed<FC_WEIGHT_BOLD>::value, SkTFixed<SkFS::kBold_Weight>::value }, { SkTFixed<FC_WEIGHT_EXTRABOLD>::value, SkTFixed<SkFS::kExtraBold_Weight>::value }, { SkTFixed<FC_WEIGHT_BLACK>::value, SkTFixed<SkFS::kBlack_Weight>::value }, - { SkTFixed<FC_WEIGHT_EXTRABLACK>::value, SkTFixed<1000>::value }, + { SkTFixed<FC_WEIGHT_EXTRABLACK>::value, SkTFixed<SkFS::kExtraBlack_Weight>::value }, }; int weight = map_ranges(get_int(pattern, FC_WEIGHT, FC_WEIGHT_REGULAR), weightRanges, SK_ARRAY_COUNT(weightRanges)); @@ -371,7 +371,7 @@ static void fcpattern_from_skfontstyle(SkFontStyle style, FcPattern* pattern) { { SkTFixed<SkFS::kBold_Weight>::value, SkTFixed<FC_WEIGHT_BOLD>::value }, { SkTFixed<SkFS::kExtraBold_Weight>::value, SkTFixed<FC_WEIGHT_EXTRABOLD>::value }, { SkTFixed<SkFS::kBlack_Weight>::value, SkTFixed<FC_WEIGHT_BLACK>::value }, - { SkTFixed<1000>::value, SkTFixed<FC_WEIGHT_EXTRABLACK>::value }, + { SkTFixed<SkFS::kExtraBlack_Weight>::value, SkTFixed<FC_WEIGHT_EXTRABLACK>::value }, }; int weight = map_ranges(style.weight(), weightRanges, SK_ARRAY_COUNT(weightRanges)); |