commit 032aac9129b8f5cbdbea3e6586d5f01f7657be9d
author Seigo Nonaka <nona@google.com> Fri May 26 10:15:53 2023 +0900
committer Seigo Nonaka <nona@google.com> Fri May 26 10:19:13 2023 +0900
tree 7b21896a3ea176fa78ae53c6d9bcf1658d6d3d78
parent 3d3d7ab616ab977a0792d8401f59171e6c830634

Rename minikin::Font::typeface to baseTypeface

Bug: 281769620
Test: N/A
Change-Id: I43ddeaf29c1f0d933e544a8bae470a6a8cc27a9e

libs/hwui/jni/text/TextShaper.cpp

diff --git a/libs/hwui/jni/text/TextShaper.cpp b/libs/hwui/jni/text/TextShaper.cpp
index 8e4dd53..d69a47c 100644
--- a/libs/hwui/jni/text/TextShaper.cpp
+++ b/libs/hwui/jni/text/TextShaper.cpp
@@ -62,7 +62,7 @@
         const minikin::Font* font = layout.getFont(i);
         if (seenFonts.find(font) != seenFonts.end()) continue;
         minikin::MinikinExtent extent = {};
-        font->typeface()->GetFontExtent(&extent, minikinPaint, layout.getFakery(i));
+        layout.typeface(i)->GetFontExtent(&extent, minikinPaint, layout.getFakery(i));
         overallAscent = std::min(overallAscent, extent.ascent);
         overallDescent = std::max(overallDescent, extent.descent);
     }