diff options
| author |  bungeman <bungeman@google.com> | 2016-06-13 10:35:05 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-13 10:35:05 -0700 |
| commit | 7ae1c72e593823e6e300e4199558555765bcec17 (patch) | |
| tree | 348622db2a485d12acd8c328eb27c3b3992f4a79 /src/core/SkFontDescriptor.h | |
| parent | 398e3f4b9f67e0c7f635e68cae1ff7f42213bbfc (diff) | |
Update typeface serialization style.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2030683002
Review-Url: https://codereview.chromium.org/2030683002
Diffstat (limited to 'src/core/SkFontDescriptor.h')
| -rw-r--r-- | src/core/SkFontDescriptor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkFontDescriptor.h b/src/core/SkFontDescriptor.h index 9b87365ed5..cb8d2f4f03 100644 --- a/src/core/SkFontDescriptor.h +++ b/src/core/SkFontDescriptor.h @@ -50,14 +50,14 @@ private: class SkFontDescriptor : SkNoncopyable { public: - SkFontDescriptor(SkTypeface::Style = SkTypeface::kNormal); + SkFontDescriptor(); // Does not affect ownership of SkStream. static bool Deserialize(SkStream*, SkFontDescriptor* result); void serialize(SkWStream*); - SkTypeface::Style getStyle() { return fStyle; } - void setStyle(SkTypeface::Style style) { fStyle = style; } + SkFontStyle getStyle() { return fStyle; } + void setStyle(SkFontStyle style) { fStyle = style; } const char* getFamilyName() const { return fFamilyName.c_str(); } const char* getFullName() const { return fFullName.c_str(); } @@ -78,7 +78,7 @@ private: SkString fPostscriptName; SkAutoTDelete<SkFontData> fFontData; - SkTypeface::Style fStyle; + SkFontStyle fStyle; }; #endif // SkFontDescriptor_DEFINED |