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/Paint.cpp

diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp
index ace896d..d2a4efe 100644
--- a/libs/hwui/jni/Paint.cpp
+++ b/libs/hwui/jni/Paint.cpp
@@ -583,7 +583,7 @@
         minikin::FakedFont baseFont = typeface->fFontCollection->baseFontFaked(typeface->fStyle);
         float saveSkewX = font->getSkewX();
         bool savefakeBold = font->isEmbolden();
-        MinikinFontSkia::populateSkFont(font, baseFont.font->typeface().get(), baseFont.fakery);
+        MinikinFontSkia::populateSkFont(font, baseFont.typeface().get(), baseFont.fakery);
         SkScalar spacing = font->getMetrics(metrics);
         // The populateSkPaint call may have changed fake bold / text skew
         // because we want to measure with those effects applied, so now