diff options
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkFontHost_linux.cpp | 7 | ||||
| -rwxr-xr-x | src/ports/SkFontHost_mac.cpp | 6 | ||||
| -rwxr-xr-x | src/ports/SkFontHost_win.cpp | 6 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_win_dw.cpp | 10 |
4 files changed, 29 insertions, 0 deletions
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp index 0b99e6517a..6003c095c1 100644 --- a/src/ports/SkFontHost_linux.cpp +++ b/src/ports/SkFontHost_linux.cpp @@ -248,6 +248,13 @@ protected: return sset->matchStyle(fontStyle); } + virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&, + const char* bcp47[], int bcp47Count, + SkUnichar character) const SK_OVERRIDE + { + return NULL; + } + virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle& fontStyle) const SK_OVERRIDE { diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index f893f61d47..7fd645bdae 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -2153,6 +2153,12 @@ protected: return NULL; } + virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&, + const char* bcp47[], int bcp47Count, + SkUnichar character) const SK_OVERRIDE { + return NULL; + } + virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle&) const SK_OVERRIDE { return NULL; diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index a394f1fd64..725c1f7a86 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -2494,6 +2494,12 @@ protected: return sset->matchStyle(fontstyle); } + virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&, + const char* bcp47[], int bcp47Count, + SkUnichar character) const SK_OVERRIDE { + return NULL; + } + virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle& fontstyle) const SK_OVERRIDE { // could be in base impl diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index f5bf85d3ae..eed57c2972 100644 --- a/src/ports/SkFontMgr_win_dw.cpp +++ b/src/ports/SkFontMgr_win_dw.cpp @@ -270,6 +270,9 @@ protected: virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE; virtual SkTypeface* onMatchFamilyStyle(const char familyName[], const SkFontStyle& fontstyle) const SK_OVERRIDE; + virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&, + const char* bcp47[], int bcp47Count, + SkUnichar character) const SK_OVERRIDE; virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle& fontstyle) const SK_OVERRIDE; virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE; @@ -483,6 +486,13 @@ SkTypeface* SkFontMgr_DirectWrite::onMatchFamilyStyle(const char familyName[], return sset->matchStyle(fontstyle); } +SkTypeface* SkFontMgr_DirectWrite::onMatchFamilyStyleCharacter(const char familyName[], + const SkFontStyle&, + const char* bcp47[], int bcp47Count, + SkUnichar character) const { + return NULL; +} + SkTypeface* SkFontMgr_DirectWrite::onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle& fontstyle) const { SkString familyName; |