diff options
| author |  bungeman <bungeman@google.com> | 2016-07-25 16:54:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-25 16:54:59 -0700 |
| commit | b8113780c3cfed640016b263194b7f1531d43312 (patch) | |
| tree | e677f7b762ad7d981f74f366075d3c5c8fbf9988 /src/fonts | |
| parent | 0f7748ab388c3a07b71e41d8042313b6744f3cae (diff) | |
Update typeface serialization style.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2030683002
Committed: https://skia.googlesource.com/skia/+/7ae1c72e593823e6e300e4199558555765bcec17
Review-Url: https://codereview.chromium.org/2030683002
Diffstat (limited to 'src/fonts')
| -rw-r--r-- | src/fonts/SkFontMgr_fontconfig.cpp | 1 | ||||
| -rw-r--r-- | src/fonts/SkTestScalerContext.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp index 937696468e..09b4d13dd4 100644 --- a/src/fonts/SkFontMgr_fontconfig.cpp +++ b/src/fonts/SkFontMgr_fontconfig.cpp @@ -31,6 +31,7 @@ void SkTypeface_FCI::onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocalSt SkString name; this->getFamilyName(&name); desc->setFamilyName(name.c_str()); + desc->setStyle(this->fontStyle()); *isLocalStream = SkToBool(this->getLocalStream()); } diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp index bab6b893e2..fcb65a83c1 100644 --- a/src/fonts/SkTestScalerContext.cpp +++ b/src/fonts/SkTestScalerContext.cpp @@ -156,6 +156,7 @@ SkAdvancedTypefaceMetrics* SkTestTypeface::onGetAdvancedTypefaceMetrics( void SkTestTypeface::onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const { desc->setFamilyName(fTestFont->fName); + desc->setStyle(this->fontStyle()); *isLocal = false; } |