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

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

Merge "Update usage of FontCollection interfaces." into sc-dev

parents de9e6190 de1e019d
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -329,7 +329,9 @@ AFont* _Nonnull AFontMatcher_match(
                static_cast<minikin::FamilyVariant>(matcher->mFamilyVariant),
                1  /* maxRun */);

    const std::shared_ptr<minikin::Font>& font = runs[0].fakedFont.font;
    const std::shared_ptr<minikin::Font>& font =
            fc->getBestFont(minikin::U16StringPiece(text, textLength), runs[0], matcher->mFontStyle)
                    .font;
    std::unique_ptr<AFont> result = std::make_unique<AFont>();
    const android::MinikinFontSkia* minikinFontSkia =
            reinterpret_cast<android::MinikinFontSkia*>(font->typeface().get());