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

Commit 51218e80 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Pass FontCollection to doLayout's argument instead of ctor 

Test: minikin_unit_tests
Test: minikin_stress_tests
Bug: 36223724
Change-Id: I55aca62eab4df0c138fec764d616984b50bd73f1
parent 64e93531

libs/hwui/hwui/MinikinUtils.cpp

+3 −2
Original line number Diff line number Diff line
@@ -58,8 +58,9 @@ minikin::Layout MinikinUtils::doLayout(const Paint* paint, int bidiFlags, 
        size_t bufSize) {

    minikin::MinikinPaint minikinPaint;

    minikin::FontStyle minikinStyle = prepareMinikinPaint(&minikinPaint, paint, typeface);

    minikin::Layout layout(Typeface::resolveDefault(typeface)->fFontCollection);

    layout.doLayout(buf, start, count, bufSize, bidiFlags, minikinStyle, minikinPaint);

    minikin::Layout layout;

    layout.doLayout(buf, start, count, bufSize, bidiFlags, minikinStyle, minikinPaint,

            Typeface::resolveDefault(typeface)->fFontCollection);

    return layout;

}