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

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

Merge "Update for changes in Minikin interface for overhangs"

parents ed82b166 0aa07a71
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ float MinikinUtils::measureText(const Paint* paint, int bidiFlags, const Typefac
    minikin::FontStyle minikinStyle = prepareMinikinPaint(&minikinPaint, paint, typeface);
    const Typeface* resolvedTypeface = Typeface::resolveDefault(typeface);
    return minikin::Layout::measureText(buf, start, count, bufSize, bidiFlags, minikinStyle,
            minikinPaint, resolvedTypeface->fFontCollection, advances, nullptr /* extent */);
            minikinPaint, resolvedTypeface->fFontCollection, advances, nullptr /* extent */,
            nullptr /* overhangs */);
}

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