diff options
| author | Billy Hewlett <billyh@google.com> | 2012-06-21 08:46:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-21 08:46:55 -0700 |
| commit | 456fc154cef79072c3ceeae231a91045e9cb0e01 (patch) | |
| tree | 6cfc9a33852c24b32942c731d11e3ac7959979f3 | |
| parent | c27ee87c8da93b6d609be1be18eaa0f0c7d07e98 (diff) | |
| parent | 8c1c7cfacd82a174c65fcbf839d7037e3692aee8 (diff) | |
| download | external_skia-456fc154cef79072c3ceeae231a91045e9cb0e01.zip external_skia-456fc154cef79072c3ceeae231a91045e9cb0e01.tar.gz external_skia-456fc154cef79072c3ceeae231a91045e9cb0e01.tar.bz2 | |
am 8c1c7cfa: Cherrypick change to skia
* commit '8c1c7cfacd82a174c65fcbf839d7037e3692aee8':
Cherrypick change to skia
| -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 30ff663..0ec6698 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -861,6 +861,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 |