Replace calls to SkFontMgr::RefDefault

impeller/typographer/BUILD.gn

@@ -46,5 +46,6 @@ impeller_component("typographer_unittests") {
     "../playground:playground_test",
     "backends/skia:typographer_skia_backend",
     "backends/stb:typographer_stb_backend",
+    "//flutter/third_party/txt",
   ]
 }

impeller/typographer/typographer_unittests.cc

@@ -12,6 +12,7 @@
 #include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
+#include "txt/platform.h"
 
 // TODO(zanderso): https://github.com/flutter/flutter/issues/127701
 // NOLINTBEGIN(bugprone-unchecked-optional-access)
@@ -275,7 +276,7 @@ TEST_P(TypographerTest, GlyphAtlasTextureIsRecreatedIfTypeChanges) {
 }
 
 TEST_P(TypographerTest, MaybeHasOverlapping) {
-  sk_sp<SkFontMgr> font_mgr = SkFontMgr::RefDefault();
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
   sk_sp<SkTypeface> typeface =
       font_mgr->matchFamilyStyle("Arial", SkFontStyle::Normal());
   SkFont sk_font(typeface, 0.5f);

lib/web_ui/skwasm/fonts.cpp

@@ -4,6 +4,7 @@
 
 #include "export.h"
 #include "third_party/skia/include/core/SkFontMgr.h"
+#include "third_party/skia/include/ports/SkFontMgr_empty.h"
 #include "third_party/skia/modules/skparagraph/include/FontCollection.h"
 #include "third_party/skia/modules/skparagraph/include/TypefaceFontProvider.h"
 #include "wrappers.h"
@@ -28,9 +29,13 @@ SKWASM_EXPORT void fontCollection_dispose(FlutterFontCollection* collection) {
   delete collection;
 }
 
+static sk_sp<SkFontMgr> default_fontmgr() {
+  static sk_sp<SkFontMgr> mgr = SkFontMgr_New_Custom_Empty();
+  return mgr;
+}
+
 SKWASM_EXPORT SkTypeface* typeface_create(SkData* fontData) {
-  auto typeface =
-      SkFontMgr::RefDefault()->makeFromData(sk_ref_sp<SkData>(fontData));
+  auto typeface = default_fontmgr()->makeFromData(sk_ref_sp<SkData>(fontData));
   return typeface.release();
 }
 

shell/platform/android/BUILD.gn

@@ -154,6 +154,7 @@ source_set("flutter_shell_native_src") {
     "//flutter/shell/platform/android/surface",
     "//flutter/shell/platform/android/surface:native_window",
     "//flutter/skia",
+    "//flutter/third_party/txt",
     "//flutter/vulkan",
   ]
 

shell/platform/android/flutter_main.cc

@@ -25,7 +25,7 @@
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/switches.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
-#include "third_party/skia/include/core/SkFontMgr.h"
+#include "txt/platform.h"
 
 namespace flutter {
 
@@ -198,7 +198,7 @@ void FlutterMain::SetupDartVMServiceUriCallback(JNIEnv* env) {
 
 static void PrefetchDefaultFontManager(JNIEnv* env, jclass jcaller) {
   // Initialize a singleton owned by Skia.
-  SkFontMgr::RefDefault();
+  txt::GetDefaultFontManager();
 }
 
 bool FlutterMain::Register(JNIEnv* env) {

shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java

@@ -151,9 +151,10 @@ public void loadLibrary() {
   private static native void nativePrefetchDefaultFontManager();
 
   /**
-   * Prefetch the default font manager provided by SkFontMgr::RefDefault() which is a process-wide
-   * singleton owned by Skia. Note that, the first call to SkFontMgr::RefDefault() will take
-   * noticeable time, but later calls will return a reference to the preexisting font manager.
+   * Prefetch the default font manager provided by txt::GetDefaultFontManager() which is a
+   * process-wide singleton owned by Skia. Note that, the first call to txt::GetDefaultFontManager()
+   * will take noticeable time, but later calls will return a reference to the preexisting font
+   * manager.
    *
    * <p>This method should only be called once across all FlutterJNI instances.
    */

third_party/txt/src/txt/platform.h

@@ -15,7 +15,7 @@ namespace txt {
 
 std::vector<std::string> GetDefaultFontFamilies();
 
-sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data);
+sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data = 0);
 
 }  // namespace txt