diff options
| author |  bungeman <bungeman@google.com> | 2014-11-10 13:29:33 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-10 13:29:33 -0800 |
| commit | c9232dcda016feb2d30abb51483b3b1862775f84 (patch) | |
| tree | 90d05cb259ca41c106dd51f21e93789f2225a587 /include/ports/SkRemotableFontMgr.h | |
| parent | b61e206138607423e83ba34d823c6036f394f655 (diff) | |
Remove SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER.
This removes the old guarded code and enables the new api
introduced with "Update fontMgr to take list of bcp47 language tags."
c20386e3937d3d398ac9b35f9c7d997e972ade98 . Blink on Android is
already using the new code.
Review URL: https://codereview.chromium.org/705843004
Diffstat (limited to 'include/ports/SkRemotableFontMgr.h')
| -rw-r--r-- | include/ports/SkRemotableFontMgr.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/ports/SkRemotableFontMgr.h b/include/ports/SkRemotableFontMgr.h index 5a0a1bc43b..29ca6e82a5 100644 --- a/include/ports/SkRemotableFontMgr.h +++ b/include/ports/SkRemotableFontMgr.h @@ -134,14 +134,9 @@ 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* 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. |