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/ports/SkFontHost_FreeType_common.h | |
| 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/ports/SkFontHost_FreeType_common.h')
| -rw-r--r-- | src/ports/SkFontHost_FreeType_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h index 79e6d65163..f093dba8a5 100644 --- a/src/ports/SkFontHost_FreeType_common.h +++ b/src/ports/SkFontHost_FreeType_common.h @@ -49,10 +49,10 @@ public: * name and style from a stream, using FreeType's API. */ static bool ScanFont(SkStream* stream, int ttcIndex, - SkString* name, SkFontStyle* style, bool* isFixedPitch); + SkString* name, SkTypeface::Style* style, bool* isFixedPitch); protected: - SkTypeface_FreeType(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch) + SkTypeface_FreeType(Style style, SkFontID uniqueID, bool isFixedPitch) : INHERITED(style, uniqueID, isFixedPitch) , fGlyphCount(-1) {} |