commit fd13042d6df898d1139cc5e7597dbbdcaea19bc3
author Seigo Nonaka <nona@google.com> Fri Sep 27 17:42:57 2024 +0900
committer Seigo Nonaka <nona@google.com> Mon Sep 30 07:08:49 2024 +0000
tree 30c1da5f4ff0125c36dcd642c366606b528d060f
parent a0811c0e93b9ec1ad1874a18789ea0dd5d0508ee

Use VariationSettings instead of vector of FontVariation

Bug: 361260253
Test: minikin_tests
Flag: com.android.text.flags.typeface_redesign
Change-Id: Ia967c6576e2e97b159aefa844207a4cce25dc749

libs/hwui/jni/FontFamily.cpp

diff --git a/libs/hwui/jni/FontFamily.cpp b/libs/hwui/jni/FontFamily.cpp
index e6d790f..9922ff3 100644
--- a/libs/hwui/jni/FontFamily.cpp
+++ b/libs/hwui/jni/FontFamily.cpp
@@ -133,9 +133,9 @@
         builder->axes.clear();
         return false;
     }
-    std::shared_ptr<minikin::MinikinFont> minikinFont =
-            std::make_shared<MinikinFontSkia>(std::move(face), fonts::getNewSourceId(), fontPtr,
-                                              fontSize, "", ttcIndex, builder->axes);
+    std::shared_ptr<minikin::MinikinFont> minikinFont = std::make_shared<MinikinFontSkia>(
+            std::move(face), fonts::getNewSourceId(), fontPtr, fontSize, "", ttcIndex,
+            minikin::VariationSettings(builder->axes, false));
     minikin::Font::Builder fontBuilder(minikinFont);
 
     if (weight != RESOLVE_BY_FONT_TABLE) {