diff options
| author |  bungeman <bungeman@google.com> | 2015-06-17 12:07:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-17 12:07:10 -0700 |
| commit | 77f85adadbc3448f4302559c14d8abf8724160da (patch) | |
| tree | 9690dc6a19a23d83629d101e285135769da68fe4 /include/ports | |
| parent | 2a4685f8bb1bf3cf098c5fee78a71e2f4204e428 (diff) | |
Move Android SkFontMgr::Factory to its own file.
Review URL: https://codereview.chromium.org/1190993002
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkFontMgr_android.h | 7 | ||||
| -rw-r--r-- | include/ports/SkTypeface_android.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/ports/SkFontMgr_android.h b/include/ports/SkFontMgr_android.h index 8d1cafd2cc..e489b161b2 100644 --- a/include/ports/SkFontMgr_android.h +++ b/include/ports/SkFontMgr_android.h @@ -12,6 +12,13 @@ class SkFontMgr; +/** + * For test only -- this only affects the default factory. + * Load font config from given xml files, instead of those from Android system. + */ +SK_API void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackconf, + const char* fontsdir); + struct SkFontMgr_Android_CustomFonts { /** When specifying custom fonts, indicates how to use system fonts. */ enum SystemFontUse { diff --git a/include/ports/SkTypeface_android.h b/include/ports/SkTypeface_android.h index f6fb3cbd08..704f9c7603 100644 --- a/include/ports/SkTypeface_android.h +++ b/include/ports/SkTypeface_android.h @@ -5,6 +5,8 @@ * found in the LICENSE file. */ +// THIS FILE IS DEPRECATED. USE SkFontMgr_android.h instead. + #ifndef SkTypeface_android_DEFINED #define SkTypeface_android_DEFINED |