From c7a20e40938ae031368e3a9e4df33ce90a765aba Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 13 May 2013 14:09:13 +0000 Subject: 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@9107 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/ports/SkTypeface_android.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include/ports/SkTypeface_android.h') diff --git a/include/ports/SkTypeface_android.h b/include/ports/SkTypeface_android.h index e87fa4805a..0d89736e7e 100644 --- a/include/ports/SkTypeface_android.h +++ b/include/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 -- cgit v1.2.3