summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-01-04 14:25:54 -0800
committerFabrice Di Meglio <fdimeglio@google.com>2012-01-04 14:25:54 -0800
commitbd7cdc32eb30e779edeec3e0d1715376aae6c546 (patch)
tree045e06d573def73c60979630f1dead02fc665b8b
parent2853041e6a5b848824a4e518a5d41cb334855302 (diff)
downloadframeworks_base-bd7cdc32eb30e779edeec3e0d1715376aae6c546.zip
frameworks_base-bd7cdc32eb30e779edeec3e0d1715376aae6c546.tar.gz
frameworks_base-bd7cdc32eb30e779edeec3e0d1715376aae6c546.tar.bz2
Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long
- do not clear the smart pointer when the cache entry does not fit the cache size Change-Id: I49f1aa1e70018bb7d6a8fb076d9269d0ec6a5d98 See: http://code.google.com/p/android/issues/detail?id=23337
-rw-r--r--core/jni/android/graphics/TextLayoutCache.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index ed6aaa1..92be8e7 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -176,7 +176,6 @@ sp<TextLayoutCacheValue> TextLayoutCache::getValue(SkPaint* paint,
value->getElapsedTime() * 0.000001f,
String8(text + start, count).string());
}
- value.clear();
}
} else {
// This is a cache hit, just log timestamp and user infos