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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-11 19:27:35 +00:00
committed by Android (Google) Code Review
parent de9e6190bf de1e019d56
commit e13111babd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
native/android/system_fonts.cpp
View File

@@ -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());