Merge "Update FakedFont to use shared pointer" into sc-dev am: 095e4fd986
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473767 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4544cdc72c180aa057b28107d2f2c2e248b8c251
This commit is contained in:
@@ -264,7 +264,7 @@ AFont* _Nonnull AFontMatcher_match(
|
||||
static_cast<minikin::FamilyVariant>(matcher->mFamilyVariant),
|
||||
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>();
|
||||
const android::MinikinFontSkia* minikinFontSkia =
|
||||
reinterpret_cast<android::MinikinFontSkia*>(font->typeface().get());
|
||||
|
||||
Reference in New Issue
Block a user