Merge "Fix bug 6558006: SystemUI native heap is huge. Fix memory leak" into jb-dev

2012-06-04 10:06:19 -07:00
parent 30384653d2 75394d6d1b
commit 6e3301dcfa
1 changed files with 4 additions and 0 deletions
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -992,6 +992,10 @@ HB_Face TextLayoutShaper::getCachedHBFace(SkTypeface* typeface) {
 }

 void TextLayoutShaper::purgeCaches() {
+    size_t cacheSize = mCachedHBFaces.size();
+    for (size_t i = 0; i < cacheSize; i++) {
+        HB_FreeFace(mCachedHBFaces.valueAt(i));
+    }
    mCachedHBFaces.clear();
    unrefTypefaces();
    init();