Create fallback font manager to solve performance drops (#78)

flutter-tizen · Apr 29, 2021 · 6e859d7 · 6e859d7
1 parent 94bd946
commit 6e859d7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/third_party/txt/src/txt/font_collection.cc b/third_party/txt/src/txt/font_collection.cc
@@ -99,6 +99,7 @@ size_t FontCollection::GetFontManagersCount() const {
 
 void FontCollection::SetupDefaultFontManager() {
   default_font_manager_ = GetDefaultFontManager();
+  fallback_font_manager_ = GetFallbackFontManager();
 }
 
 void FontCollection::SetDefaultFontManager(sk_sp<SkFontMgr> font_manager) {
@@ -144,6 +145,8 @@ std::vector<sk_sp<SkFontMgr>> FontCollection::GetFontManagerOrder() const {
     order.push_back(test_font_manager_);
   if (default_font_manager_)
     order.push_back(default_font_manager_);
+  if (fallback_font_manager_)
+    order.push_back(fallback_font_manager_);
   return order;
 }
 

diff --git a/third_party/txt/src/txt/font_collection.h b/third_party/txt/src/txt/font_collection.h
@@ -91,6 +91,7 @@ class FontCollection : public std::enable_shared_from_this<FontCollection> {
   };
 
   sk_sp<SkFontMgr> default_font_manager_;
+  sk_sp<SkFontMgr> fallback_font_manager_;
   sk_sp<SkFontMgr> asset_font_manager_;
   sk_sp<SkFontMgr> dynamic_font_manager_;
   sk_sp<SkFontMgr> test_font_manager_;

diff --git a/third_party/txt/src/txt/platform.cc b/third_party/txt/src/txt/platform.cc
@@ -14,4 +14,8 @@ sk_sp<SkFontMgr> GetDefaultFontManager() {
   return SkFontMgr::RefDefault();
 }
 
+sk_sp<SkFontMgr> GetFallbackFontManager() {
+  return nullptr;
+}
+
 }  // namespace txt
diff --git a/third_party/txt/src/txt/platform.h b/third_party/txt/src/txt/platform.h
@@ -17,6 +17,8 @@ std::vector<std::string> GetDefaultFontFamilies();
 
 sk_sp<SkFontMgr> GetDefaultFontManager();
 
+sk_sp<SkFontMgr> GetFallbackFontManager();
+
 }  // namespace txt
 
 #endif  // TXT_PLATFORM_H_
diff --git a/third_party/txt/src/txt/platform_linux.cc b/third_party/txt/src/txt/platform_linux.cc
@@ -78,7 +78,15 @@ sk_sp<SkFontMgr> GetDefaultFontManager() {
 #ifdef FLUTTER_USE_FONTCONFIG
   return SkFontMgr_New_FontConfig(nullptr);
 #else
-  return SkFontMgr_New_Custom_Directory("/usr/share/");
+  return SkFontMgr_New_Custom_Directory("/usr/share/fonts");
+#endif
+}
+
+sk_sp<SkFontMgr> GetFallbackFontManager() {
+#ifdef FLUTTER_USE_FONTCONFIG
+  return nullptr;
+#else
+  return SkFontMgr_New_Custom_Directory("/usr/share/fallback_fonts");
 #endif
 }