| Index: include/ports/SkRemotableFontMgr.h
|
| diff --git a/include/ports/SkRemotableFontMgr.h b/include/ports/SkRemotableFontMgr.h
|
| index bf2459955f5ce27d8bdaf25a2e2eb3cbde2baef1..5a0a1bc43b15c5e7097de1764803de91c04f1075 100644
|
| --- a/include/ports/SkRemotableFontMgr.h
|
| +++ b/include/ports/SkRemotableFontMgr.h
|
| @@ -134,8 +134,14 @@ public:
|
| * Note that bpc47 is a combination of ISO 639, 15924, and 3166-1 codes,
|
| * so it is fine to just pass a ISO 639 here.
|
| */
|
| +#ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER
|
| virtual SkFontIdentity matchNameStyleCharacter(const char familyName[], const SkFontStyle&,
|
| - const char bpc47[], SkUnichar character) const=0;
|
| + const char* bcp47[], int bcp47Count,
|
| + SkUnichar character) const=0;
|
| +#else
|
| + virtual SkFontIdentity matchNameStyleCharacter(const char familyName[], const SkFontStyle&,
|
| + const char bcp47[], SkUnichar character) const=0;
|
| +#endif
|
|
|
| /**
|
| * Returns the data for the given data id.
|
|
|