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

Commit 402a384a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Pass FontCollection to doLayout's argument instead of ctor"

parents 3ff3dde6 51218e80

libs/hwui/hwui/MinikinUtils.cpp

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

        size_t bufSize) {

    minikin::MinikinPaint minikinPaint;

    minikin::MinikinPaint minikinPaint;

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

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

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

    minikin::Layout layout;

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

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

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

    return layout;

    return layout;

}

}