Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE

Fabrice Di Meglio · Fabrice Di Meglio · commit a0a117b4c1a9 · 2012-01-05T14:34:42.000-08:00
- do not clear the smart pointer when the cache entry does not fit the cache size See http://code.google.com/p/android/issues/detail?id=23337 Change-Id: Id4533d9f8a396c310c9215157ec5a4c07f30c7f2
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -172,7 +172,6 @@ sp<TextLayoutCacheValue> TextLayoutCache::getValue(SkPaint* paint,
                         start, count, contextCount, size, mMaxSize - mSize, endTime,
                         String8(text, count).string());
             }
-            value.clear();
         }
     } else {
         // This is a cache hit, just log timestamp and user infos

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,6 @@ sp<TextLayoutCacheValue> TextLayoutCache::getValue(SkPaint* paint,`
`172`	`172`	`start, count, contextCount, size, mMaxSize - mSize, endTime,`
`173`	`173`	`String8(text, count).string());`
`174`	`174`	`}`
`175`		`- value.clear();`
`176`	`175`	`}`
`177`	`176`	`} else {`
`178`	`177`	`// This is a cache hit, just log timestamp and user infos`