diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-15 18:49:15 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-15 18:49:15 +0000 |
| commit | 60abb078e5597c9c6ceaba1ef495c4916ff4df0d (patch) | |
| tree | 7d982af583e3fdba330097f4d3597a4006493ad6 /include/core/SkScalerContext.h | |
| parent | 278dc6929b6481204874dcfcc055e2aaa30a95b2 (diff) | |
Merge changes from the android repo upstream to Skia
Review URL: https://codereview.appspot.com/5545070
git-svn-id: http://skia.googlecode.com/svn/trunk@3199 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkScalerContext.h')
| -rw-r--r-- | include/core/SkScalerContext.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/core/SkScalerContext.h b/include/core/SkScalerContext.h index 43baedf799..e4a28b9076 100644 --- a/include/core/SkScalerContext.h +++ b/include/core/SkScalerContext.h @@ -298,6 +298,10 @@ public: void getFontMetrics(SkPaint::FontMetrics* mX, SkPaint::FontMetrics* mY); +#ifdef SK_BUILD_FOR_ANDROID + unsigned getBaseGlyphCount(SkUnichar charCode); +#endif + static inline void MakeRec(const SkPaint&, const SkMatrix*, Rec* rec); static SkScalerContext* Create(const SkDescriptor*); |