Index: include/ports/SkFontMgr_indirect.h |
diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h |
index b9ce344a73f23daefeadde890f8a1eeb04b6e3af..95a2355a1c461a942fbf6a3a4cb3441042718016 100644 |
--- a/include/ports/SkFontMgr_indirect.h |
+++ b/include/ports/SkFontMgr_indirect.h |
@@ -39,10 +39,18 @@ protected: |
virtual SkTypeface* onMatchFamilyStyle(const char familyName[], |
const SkFontStyle& fontStyle) const SK_OVERRIDE; |
+#ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER |
virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], |
const SkFontStyle&, |
- const char bpc47[], |
- uint32_t character) const SK_OVERRIDE; |
+ const char* bcp47[], |
+ int bcp47Count, |
+ SkUnichar character) const SK_OVERRIDE; |
+#else |
+ virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], |
+ const SkFontStyle&, |
+ const char bcp47[], |
+ SkUnichar character) const SK_OVERRIDE; |
+#endif |
virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, |
const SkFontStyle& fontStyle) const SK_OVERRIDE; |