commit | 5eff9e79da6a33e832929cc79062bc818ae89328 | [log] [tgz] |
---|---|---|
author | bungeman <bungeman@google.com> | Thu Jan 21 08:18:42 2016 -0800 |
committer | Commit bot <commit-bot@chromium.org> | Thu Jan 21 08:18:43 2016 -0800 |
tree | 836e6579ca75997eef809e65981a574c7b937609 | |
parent | 1a7eb266644d2e1b0968dbca606ca0a91903419d [diff] [blame] |
Implement onMatchFamilyStyle for Mac. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1612653002 Review URL: https://codereview.chromium.org/1612653002
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 25030be..1d68c43 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp
@@ -2339,8 +2339,9 @@ } virtual SkTypeface* onMatchFamilyStyle(const char familyName[], - const SkFontStyle&) const override { - return nullptr; + const SkFontStyle& fontStyle) const override { + SkAutoTUnref<SkFontStyleSet> sset(this->matchFamily(familyName)); + return sset->matchStyle(fontStyle); } virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,