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 | |
| 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')
| -rw-r--r-- | include/core/SkImageFilter.h | 1 | ||||
| -rw-r--r-- | include/core/SkPaint.h | 5 | ||||
| -rw-r--r-- | include/core/SkPreConfig.h | 8 | ||||
| -rw-r--r-- | include/core/SkScalerContext.h | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 1bb723f46c..22b9569156 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -47,6 +47,7 @@ public: virtual bool filterImage(SkImageFilter*, const SkBitmap& src, const SkMatrix& ctm, SkBitmap* result, SkIPoint* offset) = 0; + virtual ~Proxy() {}; }; /** diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index e4717afa02..31bc30b340 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -849,9 +849,14 @@ public: #ifdef SK_BUILD_FOR_ANDROID const SkGlyph& getUnicharMetrics(SkUnichar); + const SkGlyph& getGlyphMetrics(uint16_t); const void* findImage(const SkGlyph&); uint32_t getGenerationID() const; + + /** Returns the base glyph count for the strike associated with this paint + */ + unsigned getBaseGlyphCount(SkUnichar text) const; #endif // returns true if the paint's settings (e.g. xfermode + alpha) resolve to diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 0ddbbb8a6e..4485f1dcec 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -30,15 +30,15 @@ #define SK_BUILD_FOR_WIN32 #elif defined(__SYMBIAN32__) #define SK_BUILD_FOR_WIN32 + #elif defined(ANDROID_NDK) + #define SK_BUILD_FOR_ANDROID_NDK + #elif defined(ANDROID) + #define SK_BUILD_FOR_ANDROID #elif defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__) #define SK_BUILD_FOR_UNIX #elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR #define SK_BUILD_FOR_IOS - #elif defined(ANDROID_NDK) - #define SK_BUILD_FOR_ANDROID_NDK - #elif defined(ANDROID) - #define SK_BUILD_FOR_ANDROID #else #define SK_BUILD_FOR_MAC #endif 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*); |