diff options
| author |  djsollen <djsollen@google.com> | 2014-08-13 13:09:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-13 13:09:49 -0700 |
| commit | f32331ffdb5de0440bb337aa7cbdd6f33e9ff23b (patch) | |
| tree | 59b55e8772ff4c566c6715c3102e7f3d2eb14dfe /src/ports/SkFontMgr_android.cpp | |
| parent | 828ce1f34b3471c108aee6ac2c39ddb90d0be11e (diff) | |
Remove SkPaintOptionsAndroid
R=reed@google.com, mtklein@google.com, tomhudson@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/447873003
Diffstat (limited to 'src/ports/SkFontMgr_android.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_android.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index b03185de63..e966c84f1f 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -67,7 +67,7 @@ public: bool isFixedPitch, const SkString familyName, const SkLanguage& lang, - uint32_t variantStyle) + FontVariant variantStyle) : INHERITED(index, style, isFixedPitch, familyName) , fPathName(pathName) , fLang(lang) @@ -88,7 +88,7 @@ public: const SkString fPathName; const SkLanguage fLang; - const uint32_t fVariantStyle; + const FontVariant fVariantStyle; typedef SkTypeface_Android INHERITED; }; @@ -163,11 +163,10 @@ public: continue; } - const SkLanguage& lang = fontFile.fPaintOptions.getLanguage(); - uint32_t variant = fontFile.fPaintOptions.getFontVariant(); - if (SkPaintOptionsAndroid::kDefault_Variant == variant) { - variant = SkPaintOptionsAndroid::kCompact_Variant | - SkPaintOptionsAndroid::kElegant_Variant; + const SkLanguage& lang = family.fLanguage; + uint32_t variant = family.fVariant; + if (kDefault_FontVariant == variant) { + variant = kCompact_FontVariant | kElegant_FontVariant; } // The first specified family name overrides the family name found in the font. @@ -353,7 +352,7 @@ protected: // TODO: add 'is_elegant' and 'is_compact' bits to 'style' request. // For compatibility, try 'elegant' fonts first in fallback. - uint32_t variantMask = SkPaintOptionsAndroid::kElegant_Variant; + uint32_t variantMask = kElegant_FontVariant; // The first time match anything in the mask, second time anything not in the mask. for (bool maskMatches = true; maskMatches != false; maskMatches = false) { |