From 8c1c7cfacd82a174c65fcbf839d7037e3692aee8 Mon Sep 17 00:00:00 2001 From: Billy Hewlett Date: Wed, 20 Jun 2012 17:56:31 -0700 Subject: Cherrypick change to skia Change-Id: I7514b6931a11a0a79ec3abd4068f72998fcdf99d --- include/core/SkPaint.h | 4 ++++ include/ports/SkTypeface_android.h | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 31bc30b..22d003e 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -848,6 +848,10 @@ public: SkPath* path) const; #ifdef SK_BUILD_FOR_ANDROID + + enum FontVariant { + kElegant_Variant, + }; const SkGlyph& getUnicharMetrics(SkUnichar); const SkGlyph& getGlyphMetrics(uint16_t); const void* findImage(const SkGlyph&); diff --git a/include/ports/SkTypeface_android.h b/include/ports/SkTypeface_android.h index 1a02a55..0023879 100644 --- a/include/ports/SkTypeface_android.h +++ b/include/ports/SkTypeface_android.h @@ -10,6 +10,8 @@ #define SkTypeface_android_DEFINED #include "SkTypeface.h" +#include "SkPaint.h" +#include "../harfbuzz/src/harfbuzz-shaper.h" enum FallbackScripts { kArabic_FallbackScript, @@ -30,5 +32,7 @@ enum FallbackScripts { }; -SK_API SkTypeface* SkCreateTypefaceForScript(FallbackScripts script) {return NULL; } +SK_API SkTypeface* SkCreateTypefaceForScript(HB_Script script, SkTypeface::Style style, + SkPaint::FontVariant fontVariant) { return NULL; } + #endif -- cgit v1.1