From fd655fba78b9a0814e0f7575295e2fe3f528b35c Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Fri, 13 Apr 2018 12:56:58 -0700 Subject: [PATCH] Update Layout building method doLayout is now replaced by constructor Bug: 72461923 Test: N/A Change-Id: Id07f647384c01c256d35c6b7a4000e4c94b191aa --- libs/hwui/hwui/MinikinUtils.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/hwui/hwui/MinikinUtils.cpp b/libs/hwui/hwui/MinikinUtils.cpp index a785591fe1582..24a9d76656264 100644 --- a/libs/hwui/hwui/MinikinUtils.cpp +++ b/libs/hwui/hwui/MinikinUtils.cpp @@ -51,7 +51,6 @@ minikin::Layout MinikinUtils::doLayout(const Paint* paint, minikin::Bidi bidiFla const Typeface* typeface, const uint16_t* buf, size_t start, size_t count, size_t bufSize, minikin::MeasuredText* mt) { minikin::MinikinPaint minikinPaint = prepareMinikinPaint(paint, typeface); - minikin::Layout layout; const minikin::U16StringPiece textBuf(buf, bufSize); const minikin::Range range(start, start + count); @@ -60,11 +59,10 @@ minikin::Layout MinikinUtils::doLayout(const Paint* paint, minikin::Bidi bidiFla const minikin::EndHyphenEdit endHyphen = minikin::endHyphenEdit(hyphenEdit); if (mt == nullptr) { - layout.doLayout(textBuf,range, bidiFlags, minikinPaint, startHyphen, endHyphen); + return minikin::Layout(textBuf,range, bidiFlags, minikinPaint, startHyphen, endHyphen); } else { - mt->buildLayout(textBuf, range, minikinPaint, bidiFlags, startHyphen, endHyphen, &layout); + return mt->buildLayout(textBuf, range, minikinPaint, bidiFlags, startHyphen, endHyphen); } - return layout; } float MinikinUtils::measureText(const Paint* paint, minikin::Bidi bidiFlags,