Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev

Browse Source 
* commit 'eb1f5349f8ac51e12e48497bbd2ae37badfe5009':
  Fix for b7155617 race condition in TextLayoutCache.cpp
This commit is contained in:
Raph Levien
2012-09-12 15:46:43 -07:00
committed by Android Git Automerger
parent e88d69508b eb1f5349f8
commit fde5772640
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android/graphics/TextLayoutCache.cpp
View File

@@ -78,8 +78,10 @@ void TextLayoutCache::operator()(TextLayoutCacheKey& text, sp<TextLayoutValue>&
/* /*
* Cache clearing * Cache clearing
*/ */
void TextLayoutCache::clear() { void TextLayoutCache::purgeCaches() {
AutoMutex _l(mLock);
mCache.clear(); mCache.clear();
mShaper->purgeCaches();
} }
/* /*
@@ -965,8 +967,7 @@ sp<TextLayoutValue> TextLayoutEngine::getValue(const SkPaint* paint, const jchar
void TextLayoutEngine::purgeCaches() { void TextLayoutEngine::purgeCaches() {
#if USE_TEXT_LAYOUT_CACHE #if USE_TEXT_LAYOUT_CACHE
mTextLayoutCache->clear(); mTextLayoutCache->purgeCaches();
mShaper->purgeCaches();
#if DEBUG_GLYPHS #if DEBUG_GLYPHS
ALOGD("Purged TextLayoutEngine caches"); ALOGD("Purged TextLayoutEngine caches");
#endif #endif

2
core/jni/android/graphics/TextLayoutCache.h
View File

@@ -276,7 +276,7 @@ public:
/** /**
* Clear the cache * Clear the cache
*/ */
void clear(); void purgeCaches();
private: private:
TextLayoutShaper* mShaper; TextLayoutShaper* mShaper;