diff options
| author |  bungeman <bungeman@google.com> | 2014-08-08 12:06:51 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-08 12:06:52 -0700 |
| commit | 4e3523cf546df4079cf769b8ecc8011403420a45 (patch) | |
| tree | 13c7f6d95f880ddd1d620d0dfb2adb731497e063 /include/ports | |
| parent | 8d9153fca25897bf40ca0ebac8b03616612cc7b4 (diff) | |
Blink layout tests all assume it can provide custom font configuration files on every platform. In moving Android to the font manager, we broke those.
They're ugly, but this patch reinstates them.
R=tomhudson@google.com, djsollen@google.com, reed@google.com
TBR=reed@google.com
BUG=chromium:401954
Author: bungeman@google.com
Review URL: https://codereview.chromium.org/451093002
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkTypeface_android.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/ports/SkTypeface_android.h b/include/ports/SkTypeface_android.h index c199bee29e..b25ad18597 100644 --- a/include/ports/SkTypeface_android.h +++ b/include/ports/SkTypeface_android.h @@ -39,5 +39,15 @@ SK_API bool SkGetFallbackFamilyNameForChar(SkUnichar uni, const char* lang, SkSt SK_API void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackconf, const char* fontsdir); +/** + * For test only. + * Returns the information set by SkUseTestFontConfigFile. + * TODO: this should be removed once SkFontConfigInterface_android is removed, + * and then Chromium should be given a better way to set up it's test environment + * than SkUseTestFontConfigFile. + */ +void SkGetTestFontConfiguration(const char** mainconf, const char** fallbackconf, + const char** fontsdir); + #endif // #ifdef SK_BUILD_FOR_ANDROID #endif // #ifndef SkTypeface_android_DEFINED |