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

Commit 2ee2d59b authored by Victoria Lease's avatar Victoria Lease
Browse files

pass SkGlyphCache into updateGlyphCache() 

Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.

Bug: 11968757
Change-Id: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89
parent 0a11eb10

libs/hwui/font/Font.cpp

+5 −6
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ CachedGlyphInfo* Font::getCachedGlyph(SkPaint* paint, glyph_t textUnit, bool pre 
        if (!cachedGlyph->mIsValid) {

            SkAutoGlyphCache autoCache(*paint, NULL, &mDescription.mLookupTransform);

            const SkGlyph& skiaGlyph = GET_METRICS(autoCache.getCache(), textUnit);

            updateGlyphCache(paint, skiaGlyph, cachedGlyph, precaching);

            updateGlyphCache(paint, skiaGlyph, autoCache.getCache(), cachedGlyph, precaching);

        }

    } else {

        cachedGlyph = cacheGlyph(paint, textUnit, precaching);
@@ -416,8 +416,8 @@ void Font::render(SkPaint* paint, const char* text, uint32_t start, uint32_t len 
    }

}



void Font::updateGlyphCache(SkPaint* paint, const SkGlyph& skiaGlyph, CachedGlyphInfo* glyph,

        bool precaching) {

void Font::updateGlyphCache(SkPaint* paint, const SkGlyph& skiaGlyph, SkGlyphCache* skiaGlyphCache,

        CachedGlyphInfo* glyph, bool precaching) {

    glyph->mAdvanceX = skiaGlyph.fAdvanceX;

    glyph->mAdvanceY = skiaGlyph.fAdvanceY;

    glyph->mBitmapLeft = skiaGlyph.fLeft;
@@ -429,9 +429,8 @@ void Font::updateGlyphCache(SkPaint* paint, const SkGlyph& skiaGlyph, CachedGlyp 
    uint32_t startY = 0;



    // Get the bitmap for the glyph

    SkAutoGlyphCache autoCache(*paint, NULL, &mDescription.mLookupTransform);

    if (!skiaGlyph.fImage) {

        autoCache.getCache()->findImage(skiaGlyph);

        skiaGlyphCache->findImage(skiaGlyph);

    }

    mState->cacheBitmap(skiaGlyph, glyph, &startX, &startY, precaching);
@@ -470,7 +469,7 @@ CachedGlyphInfo* Font::cacheGlyph(SkPaint* paint, glyph_t glyph, bool precaching 
    newGlyph->mIsValid = false;

    newGlyph->mGlyphIndex = skiaGlyph.fID;



    updateGlyphCache(paint, skiaGlyph, newGlyph, precaching);

    updateGlyphCache(paint, skiaGlyph, autoCache.getCache(), newGlyph, precaching);



    return newGlyph;

}

libs/hwui/font/Font.h

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <utils/KeyedVector.h>



#include <SkGlyphCache.h>

#include <SkScalerContext.h>

#include <SkPaint.h>

#include <SkPathMeasure.h>
@@ -117,8 +118,8 @@ private: 
    void invalidateTextureCache(CacheTexture* cacheTexture = NULL);



    CachedGlyphInfo* cacheGlyph(SkPaint* paint, glyph_t glyph, bool precaching);

    void updateGlyphCache(SkPaint* paint, const SkGlyph& skiaGlyph, CachedGlyphInfo* glyph,

            bool precaching);

    void updateGlyphCache(SkPaint* paint, const SkGlyph& skiaGlyph, SkGlyphCache* skiaGlyphCache,

            CachedGlyphInfo* glyph, bool precaching);



    void measureCachedGlyph(CachedGlyphInfo* glyph, int x, int y,

            uint8_t *bitmap, uint32_t bitmapW, uint32_t bitmapH,