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

Commit 086994b6 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Update legacy font renderer to use the updated method names from Skia 

Part 2

Test: hwui_unit_tests
Change-Id: I749b0339dd05589d43e04b04e68df286b69884af
parent f2b4b37d

libs/hwui/tests/common/TestUtils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ void TestUtils::layoutTextUnscaled(const SkPaint& paint, const char* text, 
        int32_t unichar = utf32_from_utf8_at(text, 4, 0, &nextIndex);

        text += nextIndex;



        glyph_t glyph = autoCache.get()->unicharToGlyph(unichar);

        autoCache.getCache()->unicharToGlyph(unichar);

        glyph_t glyph = autoCache->unicharToGlyph(unichar);

        autoCache->unicharToGlyph(unichar);



        // push glyph and its relative position

        outGlyphs->push_back(glyph);
@@ -105,7 +105,7 @@ void TestUtils::layoutTextUnscaled(const SkPaint& paint, const char* text, 
        outPositions->push_back(0);



        // compute bounds

        SkGlyph skGlyph = autoCache.get()->getUnicharMetrics(unichar);

        SkGlyph skGlyph = autoCache->getUnicharMetrics(unichar);

        Rect glyphBounds(skGlyph.fWidth, skGlyph.fHeight);

        glyphBounds.translate(totalAdvance + skGlyph.fLeft, skGlyph.fTop);

        bounds.unionWith(glyphBounds);