Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb1f5349 authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

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

parents 4a86019a 13ba4e47

core/jni/android/graphics/TextLayoutCache.cpp

+4 −3
Original line number Diff line number Diff line
@@ -78,8 +78,10 @@ void TextLayoutCache::operator()(TextLayoutCacheKey& text, sp<TextLayoutValue>& 
/*

 * Cache clearing

 */

void TextLayoutCache::clear() {

void TextLayoutCache::purgeCaches() {

    AutoMutex _l(mLock);

    mCache.clear();

    mShaper->purgeCaches();

}



/*
@@ -965,8 +967,7 @@ sp<TextLayoutValue> TextLayoutEngine::getValue(const SkPaint* paint, const jchar 


void TextLayoutEngine::purgeCaches() {

#if USE_TEXT_LAYOUT_CACHE

    mTextLayoutCache->clear();

    mShaper->purgeCaches();

    mTextLayoutCache->purgeCaches();

#if DEBUG_GLYPHS

    ALOGD("Purged TextLayoutEngine caches");

#endif

core/jni/android/graphics/TextLayoutCache.h

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ public: 
    /**

     * Clear the cache

     */

    void clear();

    void purgeCaches();



private:

    TextLayoutShaper* mShaper;