diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-13 14:09:13 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-13 14:09:13 +0000 |
commit | 83c946c07af46c58cc747d1da087c81fe288d621 (patch) | |
tree | a01cd5b2daea61bb3d3d1f20fdc6e3b1ac1b8345 /ports | |
parent | 2bdb95ec5639be97d4a67a78964519f8c52282fa (diff) | |
download | include-83c946c07af46c58cc747d1da087c81fe288d621.tar.gz |
API modifications needed to upstream Android font changes.
Committed: http://code.google.com/p/skia/source/detail?r=9083
R=reed@google.com
Author: djsollen@google.com
Review URL: https://chromiumcodereview.appspot.com/14761003
git-svn-id: http://skia.googlecode.com/svn/trunk/include@9107 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'ports')
-rw-r--r-- | ports/SkTypeface_android.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ports/SkTypeface_android.h b/ports/SkTypeface_android.h index e87fa48..0d89736 100644 --- a/ports/SkTypeface_android.h +++ b/ports/SkTypeface_android.h @@ -9,6 +9,8 @@ #ifndef SkTypeface_android_DEFINED #define SkTypeface_android_DEFINED +#ifdef SK_BUILD_FOR_ANDROID + #include "SkTypeface.h" /** @@ -39,6 +41,8 @@ SK_API void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackco * get the 3rd can still inspect the original, and try to match its * stylistic attributes. */ -SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID); +SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID, + const SkPaintOptionsAndroid& options); -#endif +#endif // #ifdef SK_BUILD_FOR_ANDROID +#endif // #ifndef SkTypeface_android_DEFINED |