diff options
| author |  mtklein <mtklein@google.com> | 2014-10-20 12:54:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-20 12:54:31 -0700 |
| commit | 802ad83dca2efd57fde6c7ba666555ea78b5324c (patch) | |
| tree | de3ef90d0e9906ee2c16388b58e17e12976d833b /src/fonts/SkGScalerContext.cpp | |
| parent | 43b8b36b20ae00e2d78421c4cda1f3f922983a20 (diff) | |
Revert of Replace SkTypeface::Style with SkFontStyle. (patchset #9 id:160001 of https://codereview.chromium.org/488143002/)
Reason for revert:
CrOS GM failures:
[*] 2 ExpectationsMismatch: fontmgr_iter_565.png fontmgr_iter_8888.png
Original issue's description:
> Replace SkTypeface::Style with SkFontStyle.
>
> Committed: https://skia.googlesource.com/skia/+/43b8b36b20ae00e2d78421c4cda1f3f922983a20
TBR=reed@google.com,bungeman@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/667023002
Diffstat (limited to 'src/fonts/SkGScalerContext.cpp')
| -rw-r--r-- | src/fonts/SkGScalerContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fonts/SkGScalerContext.cpp b/src/fonts/SkGScalerContext.cpp index cacc27064f..34a788a9c9 100644 --- a/src/fonts/SkGScalerContext.cpp +++ b/src/fonts/SkGScalerContext.cpp @@ -158,7 +158,7 @@ void SkGScalerContext::generateFontMetrics(SkPaint::FontMetrics* metrics) { #include "SkTypefaceCache.h" SkGTypeface::SkGTypeface(SkTypeface* proxy, const SkPaint& paint) - : SkTypeface(proxy->fontStyle(), SkTypefaceCache::NewFontID(), false) + : SkTypeface(proxy->style(), SkTypefaceCache::NewFontID(), false) , fProxy(SkRef(proxy)) , fPaint(paint) {} |