diff options
Diffstat (limited to 'src/fonts/SkFontMgr_indirect.cpp')
| -rw-r--r-- | src/fonts/SkFontMgr_indirect.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp index 54f2de8290..c9d30259c5 100644 --- a/src/fonts/SkFontMgr_indirect.cpp +++ b/src/fonts/SkFontMgr_indirect.cpp @@ -245,13 +245,25 @@ SkTypeface* SkFontMgr_Indirect::onMatchFamilyStyle(const char familyName[], return this->createTypefaceFromFontId(id); } +#ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER SkTypeface* SkFontMgr_Indirect::onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle& style, - const char bpc47[], - uint32_t character) const { - SkFontIdentity id = fProxy->matchNameStyleCharacter(familyName, style, bpc47, character); + const char* bcp47[], + int bcp47Count, + SkUnichar character) const { + SkFontIdentity id = fProxy->matchNameStyleCharacter(familyName, style, bcp47, + bcp47Count, character); return this->createTypefaceFromFontId(id); } +#else +SkTypeface* SkFontMgr_Indirect::onMatchFamilyStyleCharacter(const char familyName[], + const SkFontStyle& style, + const char bcp47[], + SkUnichar character) const { + SkFontIdentity id = fProxy->matchNameStyleCharacter(familyName, style, bcp47, character); + return this->createTypefaceFromFontId(id); +} +#endif SkTypeface* SkFontMgr_Indirect::onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle& fontStyle) const { |