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

Commit 0f498017 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update FakedFont to use shared pointer" into sc-dev am: 095e4fd9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473767

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4544cdc72c180aa057b28107d2f2c2e248b8c251
parents 4a88e2c6 095e4fd9

native/android/system_fonts.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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());