From 3fba8a33beb02232cd63b64360515b6b4c0f8683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20H=C4=83loiu?= Date: Tue, 21 Mar 2023 20:48:49 +0000 Subject: [PATCH] Fix duplicate calls to system font loading on Linux (flutter/engine#40469) --- .../third_party/txt/src/txt/platform_linux.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/engine/src/flutter/third_party/txt/src/txt/platform_linux.cc b/engine/src/flutter/third_party/txt/src/txt/platform_linux.cc index 86dc2132c2..072c6c15c9 100644 --- a/engine/src/flutter/third_party/txt/src/txt/platform_linux.cc +++ b/engine/src/flutter/third_party/txt/src/txt/platform_linux.cc @@ -4,12 +4,6 @@ #include "txt/platform.h" -#ifdef FLUTTER_USE_FONTCONFIG -#include "third_party/skia/include/ports/SkFontMgr_fontconfig.h" -#else -#include "third_party/skia/include/ports/SkFontMgr_directory.h" -#endif - namespace txt { std::vector GetDefaultFontFamilies() { @@ -17,11 +11,7 @@ std::vector GetDefaultFontFamilies() { } sk_sp GetDefaultFontManager(uint32_t font_initialization_data) { -#ifdef FLUTTER_USE_FONTCONFIG - return SkFontMgr_New_FontConfig(nullptr); -#else - return SkFontMgr_New_Custom_Directory("/usr/share/fonts/"); -#endif + return SkFontMgr::RefDefault(); } } // namespace txt