diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-04-14 09:57:06 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2011-04-14 15:01:11 -0400 |
| commit | 87b8e645865f9633f410c02252a0fd3feb18f09b (patch) | |
| tree | 21e2521ed6f69bf466849f7c9579c37aa6b22b06 /include/core/SkPaint.h | |
| parent | 7f10e10e25231b613ebb242fa14ad8c924ce694f (diff) | |
| download | external_skia-87b8e645865f9633f410c02252a0fd3feb18f09b.zip external_skia-87b8e645865f9633f410c02252a0fd3feb18f09b.tar.gz external_skia-87b8e645865f9633f410c02252a0fd3feb18f09b.tar.bz2 | |
Skia Merge (revision 1116)
There is a companion change in external/webkit
Change-Id: I1c4110e7520bbef3f4e5f9551adb7ec79ac1e3ed
Diffstat (limited to 'include/core/SkPaint.h')
| -rw-r--r-- | include/core/SkPaint.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index eec11cf..f4b325f 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -89,12 +89,7 @@ public: return static_cast<Hinting>(fHinting); } - void setHinting(Hinting hintingLevel) { - if ((unsigned) hintingLevel != fHinting) { - fGenerationID++; - fHinting = hintingLevel; - } - } + void setHinting(Hinting hintingLevel); /** Specifies the bit values that are stored in the paint's flags. */ @@ -820,10 +815,12 @@ public: void getTextPath(const void* text, size_t length, SkScalar x, SkScalar y, SkPath* path) const; +#ifdef ANDROID const SkGlyph& getUnicharMetrics(SkUnichar); const void* findImage(const SkGlyph&); uint32_t getGenerationID() const; +#endif private: SkTypeface* fTypeface; @@ -849,7 +846,9 @@ private: unsigned fStyle : 2; unsigned fTextEncoding : 2; // 3 values unsigned fHinting : 2; +#ifdef ANDROID uint32_t fGenerationID; +#endif SkDrawCacheProc getDrawCacheProc() const; SkMeasureCacheProc getMeasureCacheProc(TextBufferDirection dir, |