diff options
| author | Billy Hewlett <billyh@google.com> | 2012-06-20 17:56:31 -0700 |
|---|---|---|
| committer | Billy Hewlett <billyh@google.com> | 2012-06-20 17:56:31 -0700 |
| commit | 8c1c7cfacd82a174c65fcbf839d7037e3692aee8 (patch) | |
| tree | a9f1fd1d5f60ba443af57e079f53d4ef170a93e5 | |
| parent | 9b1d07582a57f0bf58a60f0b8e8f81a5d1c6b867 (diff) | |
| download | external_skia-8c1c7cfacd82a174c65fcbf839d7037e3692aee8.zip external_skia-8c1c7cfacd82a174c65fcbf839d7037e3692aee8.tar.gz external_skia-8c1c7cfacd82a174c65fcbf839d7037e3692aee8.tar.bz2 | |
Cherrypick change to skia
Change-Id: I7514b6931a11a0a79ec3abd4068f72998fcdf99d
| -rw-r--r-- | include/core/SkPaint.h | 4 | ||||
| -rw-r--r-- | include/ports/SkTypeface_android.h | 6 |
2 files changed, 9 insertions, 1 deletions
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 |