aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/ports/SkTypeface_android.h
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-13 14:09:13 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-13 14:09:13 +0000
commitc7a20e40938ae031368e3a9e4df33ce90a765aba (patch)
tree4add9484124ec6dd3893593f639575d6a9ccb3b3 /include/ports/SkTypeface_android.h
parent28ac96e40d705f7fb08a61ac027e15de8d91823c (diff)
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
Diffstat (limited to 'include/ports/SkTypeface_android.h')
-rw-r--r--include/ports/SkTypeface_android.h8
1 files changed, 6 insertions, 2 deletions
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