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

Commit 5eba0763 authored by Ben Wagner's avatar Ben Wagner Committed by Android (Google) Code Review
Browse files

Merge "Use SkTypeface::makeClone when creating variation" into main

parents 90c49e70 27ddcf49

libs/hwui/hwui/MinikinSkia.cpp

+2 −8
Original line number Diff line number Diff line
@@ -131,11 +131,6 @@ std::shared_ptr<minikin::MinikinFont> MinikinFontSkia::createFontWithVariation( 
        const std::vector<minikin::FontVariation>& variations) const {

    SkFontArguments args;



    int ttcIndex;

    std::unique_ptr<SkStreamAsset> stream(mTypeface->openStream(&ttcIndex));

    LOG_ALWAYS_FATAL_IF(stream == nullptr, "openStream failed");



    args.setCollectionIndex(ttcIndex);

    std::vector<SkFontArguments::VariationPosition::Coordinate> skVariation;

    skVariation.resize(variations.size());

    for (size_t i = 0; i < variations.size(); i++) {
@@ -143,11 +138,10 @@ std::shared_ptr<minikin::MinikinFont> MinikinFontSkia::createFontWithVariation( 
        skVariation[i].value = SkFloatToScalar(variations[i].value);

    }

    args.setVariationDesignPosition({skVariation.data(), static_cast<int>(skVariation.size())});

    sk_sp<SkFontMgr> fm = android::FreeTypeFontMgr();

    sk_sp<SkTypeface> face(fm->makeFromStream(std::move(stream), args));

    sk_sp<SkTypeface> face = mTypeface->makeClone(args);



    return std::make_shared<MinikinFontSkia>(std::move(face), mSourceId, mFontData, mFontSize,

                                             mFilePath, ttcIndex, variations);

                                             mFilePath, mTtcIndex, variations);

}



// hinting<<16 | edging<<8 | bools:5bits