commit 095e4fd986e63e42e7f3e0619925fac2033f986e
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Feb 06 01:27:57 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 06 01:27:57 2021 +0000
tree 6068850b13ea279e7d646b109559119e00bf8542
parent e5cb2b87a4d492ef5113d9d94921626b8828b0ae
parent 0e5f67a04e0978f1bdebf3becf23d2682c9c80c5

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

native/android/system_fonts.cpp

diff --git a/native/android/system_fonts.cpp b/native/android/system_fonts.cpp
index 45f42f1b5..48d7380 100644
--- a/native/android/system_fonts.cpp
+++ b/native/android/system_fonts.cpp
@@ -264,7 +264,7 @@
                 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());