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

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

Merge "Update measureText arguments and MinikinExtent member."

parents baabc6ff 3593549b

libs/hwui/hwui/MinikinSkia.cpp

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ void MinikinFontSkia::GetFontExtent(minikin::MinikinExtent* extent, 
    skPaint.getFontMetrics(&metrics);

    extent->ascent = metrics.fAscent;

    extent->descent = metrics.fDescent;

    extent->line_gap = metrics.fLeading;

}



SkTypeface* MinikinFontSkia::GetSkTypeface() const {

libs/hwui/hwui/MinikinUtils.cpp

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ float MinikinUtils::measureText(const Paint* paint, minikin::Bidi bidiFlags, 
    const minikin::EndHyphenEdit endHyphen = minikin::endHyphenEdit(hyphenEdit);



    return minikin::Layout::measureText(textBuf, range, bidiFlags, minikinPaint, startHyphen,

                                        endHyphen, advances, nullptr /* extent */,

                                        nullptr /* layout pieces */);

                                        endHyphen, advances, nullptr /* layout pieces */);

}



bool MinikinUtils::hasVariationSelector(const Typeface* typeface, uint32_t codepoint, uint32_t vs) {