diff options
| author |  mtklein <mtklein@google.com> | 2016-06-13 11:27:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-13 11:27:55 -0700 |
| commit | f8f9c07c283a3204a38b4324c14597e644686428 (patch) | |
| tree | 73effdf236fbef7655a5c8a18a88f1ffd8f63e4b /src/fonts | |
| parent | be36d59e664513294c02ff9691a3c1817a712fee (diff) | |
Revert of Update typeface serialization style. (patchset #3 id:40001 of https://codereview.chromium.org/2030683002/ )
Reason for revert:
serialize-8888 broken for typefacestyles on Mac. (Bold weighting goes missing.)
Original issue's description:
> Update typeface serialization style.
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2030683002
>
> Committed: https://skia.googlesource.com/skia/+/7ae1c72e593823e6e300e4199558555765bcec17
TBR=reed@google.com,bungeman@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2067583002
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, 0 insertions, 2 deletions
diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp index 09b4d13dd4..937696468e 100644 --- a/src/fonts/SkFontMgr_fontconfig.cpp +++ b/src/fonts/SkFontMgr_fontconfig.cpp @@ -31,7 +31,6 @@ 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 6cfcb738da..a2748564a5 100644 --- a/src/fonts/SkTestScalerContext.cpp +++ b/src/fonts/SkTestScalerContext.cpp @@ -156,7 +156,6 @@ SkAdvancedTypefaceMetrics* SkTestTypeface::onGetAdvancedTypefaceMetrics( void SkTestTypeface::onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const { desc->setFamilyName(fTestFont->fName); - desc->setStyle(this->fontStyle()); *isLocal = false; } |