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/utils/SkWhitelistTypefaces.cpp | |
| 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/utils/SkWhitelistTypefaces.cpp')
| -rw-r--r-- | src/utils/SkWhitelistTypefaces.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/utils/SkWhitelistTypefaces.cpp b/src/utils/SkWhitelistTypefaces.cpp index bc454bfe1d..2912fe2501 100644 --- a/src/utils/SkWhitelistTypefaces.cpp +++ b/src/utils/SkWhitelistTypefaces.cpp @@ -83,12 +83,13 @@ static uint32_t compute_checksum(const SkTypeface* tf) { return SkChecksum::Murmur3(data.begin(), length); } -static void serialize_sub(const char* fontName, SkTypeface::Style style, SkWStream* wstream) { - SkFontDescriptor desc(style); +static void serialize_sub(const char* fontName, SkFontStyle style, SkWStream* wstream) { + SkFontDescriptor desc; SkString subName(SUBNAME_PREFIX); subName.append(fontName); const char* familyName = subName.c_str(); desc.setFamilyName(familyName); + desc.setStyle(style); desc.serialize(wstream); #if WHITELIST_DEBUG for (int i = 0; i < whitelistCount; ++i) { @@ -105,14 +106,14 @@ static void serialize_sub(const char* fontName, SkTypeface::Style style, SkWStre static bool is_local(const SkTypeface* tf) { bool isLocal = false; - SkFontDescriptor desc(tf->style()); + SkFontDescriptor desc; tf->getFontDescriptor(&desc, &isLocal); return isLocal; } static void serialize_full(const SkTypeface* tf, SkWStream* wstream) { bool isLocal = false; - SkFontDescriptor desc(tf->style()); + SkFontDescriptor desc; tf->getFontDescriptor(&desc, &isLocal); // Embed font data if it's a local font. @@ -124,7 +125,7 @@ static void serialize_full(const SkTypeface* tf, SkWStream* wstream) { static void serialize_name_only(const SkTypeface* tf, SkWStream* wstream) { bool isLocal = false; - SkFontDescriptor desc(tf->style()); + SkFontDescriptor desc; tf->getFontDescriptor(&desc, &isLocal); SkASSERT(!isLocal); #if WHITELIST_DEBUG @@ -180,7 +181,7 @@ void WhitelistSerializeTypeface(const SkTypeface* tf, SkWStream* wstream) { #endif whitelist[whitelistIndex].fChecksum = checksum; } - serialize_sub(fontName, tf->style(), wstream); + serialize_sub(fontName, tf->fontStyle(), wstream); } sk_sp<SkTypeface> WhitelistDeserializeTypeface(SkStream* stream) { @@ -200,7 +201,7 @@ sk_sp<SkTypeface> WhitelistDeserializeTypeface(SkStream* stream) { if (!strncmp(SUBNAME_PREFIX, familyName, sizeof(SUBNAME_PREFIX) - 1)) { familyName += sizeof(SUBNAME_PREFIX) - 1; } - return SkTypeface::MakeFromName(familyName, SkFontStyle::FromOldStyle(desc.getStyle())); + return SkTypeface::MakeFromName(familyName, desc.getStyle()); } bool CheckChecksums() { |