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

Merge "Update FakedFont to use shared pointer" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-06 01:27:57 +00:00
committed by Android (Google) Code Review
parent e5cb2b87a4 0e5f67a04e
commit 095e4fd986
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
native/android/system_fonts.cpp
View File

@@ -264,7 +264,7 @@ AFont* _Nonnull AFontMatcher_match(
static_cast<minikin::FamilyVariant>(matcher->mFamilyVariant), static_cast<minikin::FamilyVariant>(matcher->mFamilyVariant),
1 /* maxRun */); 1 /* maxRun */);
const minikin::Font* font = runs[0].fakedFont.font; const std::shared_ptr<minikin::Font>& font = runs[0].fakedFont.font;
std::unique_ptr<AFont> result = std::make_unique<AFont>(); std::unique_ptr<AFont> result = std::make_unique<AFont>();
const android::MinikinFontSkia* minikinFontSkia = const android::MinikinFontSkia* minikinFontSkia =
reinterpret_cast<android::MinikinFontSkia*>(font->typeface().get()); reinterpret_cast<android::MinikinFontSkia*>(font->typeface().get());