| Index: src/fonts/SkFontMgr_indirect.cpp
|
| diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp
|
| index 54f2de82901a246bbf60474c04543b9300e3ab22..c9d30259c50138b43fba2c77119a4813363467e8 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 {
|
|
|