diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-01-23 13:33:27 -0800 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-01-23 13:33:27 -0800 |
| commit | 0b8227a431da6c6bfda72ba88d9a69283c8412a9 (patch) | |
| tree | 010b7655ba7e230b396ca04096069dffee8694d3 | |
| parent | 37f5d360c42dc162f3c9fd5b30f064e714c9b91e (diff) | |
| download | external_skia-0b8227a431da6c6bfda72ba88d9a69283c8412a9.zip external_skia-0b8227a431da6c6bfda72ba88d9a69283c8412a9.tar.gz external_skia-0b8227a431da6c6bfda72ba88d9a69283c8412a9.tar.bz2 | |
Fix bug #5846413 "phone" keyboard layout is broken on master
- make getBaseGlyphCount() "const"
Change-Id: Ia1945448b7df537ff7d30f35b666646389c8ffae
| -rw-r--r-- | include/core/SkPaint.h | 2 | ||||
| -rw-r--r-- | src/core/SkPaint.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 02ebdc3..5bd7060 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -828,7 +828,7 @@ public: /** Returns the base glyph count for the strike associated with this paint */ - unsigned getBaseGlyphCount(SkUnichar text); + unsigned getBaseGlyphCount(SkUnichar text) const; #endif private: diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 6dca1a8..4b360cc 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -157,7 +157,7 @@ uint32_t SkPaint::getGenerationID() const { #endif #ifdef ANDROID -unsigned SkPaint::getBaseGlyphCount(SkUnichar text) { +unsigned SkPaint::getBaseGlyphCount(SkUnichar text) const { SkAutoGlyphCache autoCache(*this, NULL); SkGlyphCache* cache = autoCache.getCache(); return cache->getBaseGlyphCount(text); |