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

native/android/system_fonts.cpp

diff --git a/native/android/system_fonts.cpp b/native/android/system_fonts.cpp
index 91f78ce..0c07b2a 100644
--- a/native/android/system_fonts.cpp
+++ b/native/android/system_fonts.cpp
@@ -327,7 +327,7 @@
     result->mWeight = font->style().weight();
     result->mItalic = font->style().slant() == minikin::FontStyle::Slant::ITALIC;
     result->mCollectionIndex = minikinFontSkia->GetFontIndex();
-    const std::vector<minikin::FontVariation>& axes = minikinFontSkia->GetAxes();
+    const minikin::VariationSettings& axes = minikinFontSkia->GetAxes();
     result->mAxes.reserve(axes.size());
     for (auto axis : axes) {
         result->mAxes.push_back(std::make_pair(axis.axisTag, axis.value));