commit 04931014964feee74a269b78abbbd8444cc373c9
author Kevin Lubick <kjlubick@google.com> Wed Nov 15 19:17:43 2023 +0000
committer Kevin Lubick <kjlubick@google.com> Fri Nov 17 15:22:47 2023 +0000
tree e8830a34aa9d50275409c09ab54e3ac815bbd6fe
parent 4e8841788cadf886a976ad2b9da3fa1cf277b2b6

[base] Replace SkFontMgr::RefDefault() with FreeTypeFontMgr

Android Renderengine doesn't draw any text, but hwui needs
to turn bytes into SkTypefaces and it currently uses Skia's
"Empty Custom" SkFontMgr, which is really just a wrapper around
FreeType. This makes that connection explicit instead of relying
on SkFontMgr::RefDefault(), which is going away soon.

Change-Id: Ida96538c76e069ec86e8dc078ef329cfaeac5d78
Bug: b/305780908

libs/hwui/tests/unit/UnderlineTest.cpp

diff --git a/libs/hwui/tests/unit/UnderlineTest.cpp b/libs/hwui/tests/unit/UnderlineTest.cpp
index db2be20..c70a304 100644
--- a/libs/hwui/tests/unit/UnderlineTest.cpp
+++ b/libs/hwui/tests/unit/UnderlineTest.cpp
@@ -36,6 +36,7 @@
 #include "hwui/MinikinUtils.h"
 #include "hwui/Paint.h"
 #include "hwui/Typeface.h"
+#include "utils/TypefaceUtils.h"
 
 using namespace android;
 
@@ -66,7 +67,7 @@
     sk_sp<SkData> skData =
             SkData::MakeWithProc(data, st.st_size, unmap, reinterpret_cast<void*>(st.st_size));
     std::unique_ptr<SkStreamAsset> fontData(new SkMemoryStream(skData));
-    sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());
+    sk_sp<SkFontMgr> fm = android::FreeTypeFontMgr();
     sk_sp<SkTypeface> typeface(fm->makeFromStream(std::move(fontData)));
     LOG_ALWAYS_FATAL_IF(typeface == nullptr, "Failed to make typeface from %s", fileName);
     std::shared_ptr<minikin::MinikinFont> font =