Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Layout building method

Browse Source 
doLayout is now replaced by constructor

Bug: 72461923
Test: N/A
Change-Id: Id07f647384c01c256d35c6b7a4000e4c94b191aa
This commit is contained in:
Seigo Nonaka
2018-04-13 12:56:58 -07:00
parent aac73522b5
commit fd655fba78
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hwui/hwui/MinikinUtils.cpp
View File

@@ -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,