Revert flutter#78 flutter#69 (flutter#122)

* Revert "Create fallback font manager to solve performance drops (flutter#78)" This reverts commit c761164. * Revert "Fix font breaking issues (flutter#69)" This reverts commit 5552dd5. * Add SamsungOneUI to DefaultFontFamilies Signed-off-by: Boram Bae <[email protected]>
WonyoungChoi · Dec 17, 2021 · 6e30893 · 6e30893
1 parent a991db1
commit 6e30893
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 82 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -73,6 +73,7 @@ jobs:
         --target-sysroot $HOME/tizen_tools/sysroot/$(arch) \
         --target-triple $(targetTriple) \
         --runtime-mode $(mode) \
+        --enable-fontconfig \
         --embedder-for-target \
         --disable-desktop-embeddings \
         --build-tizen-shell

diff --git a/third_party/txt/src/txt/font_collection.cc b/third_party/txt/src/txt/font_collection.cc
@@ -100,7 +100,6 @@ size_t FontCollection::GetFontManagersCount() const {
 void FontCollection::SetupDefaultFontManager(
     uint32_t font_initialization_data) {
   default_font_manager_ = GetDefaultFontManager(font_initialization_data);
-  fallback_font_manager_ = GetFallbackFontManager(font_initialization_data);
 }
 
 void FontCollection::SetDefaultFontManager(sk_sp<SkFontMgr> font_manager) {
@@ -146,8 +145,6 @@ 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;
 }
 
@@ -191,6 +188,7 @@ FontCollection::GetMinikinFontCollectionForFamilies(
           FindFontFamilyInManagers(family);
       if (minikin_family != nullptr) {
         minikin_families.push_back(minikin_family);
+        break;
       }
     }
   }

diff --git a/third_party/txt/src/txt/font_collection.h b/third_party/txt/src/txt/font_collection.h
@@ -91,7 +91,6 @@ 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,8 +14,4 @@ sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
   return SkFontMgr::RefDefault();
 }
 
-sk_sp<SkFontMgr> GetFallbackFontManager(uint32_t font_initialization_data) {
-  return nullptr;
-}
-
 }  // namespace txt
diff --git a/third_party/txt/src/txt/platform.h b/third_party/txt/src/txt/platform.h
@@ -17,8 +17,6 @@ std::vector<std::string> GetDefaultFontFamilies();
 
 sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data);
 
-sk_sp<SkFontMgr> GetFallbackFontManager(uint32_t font_initialization_data);
-
 }  // 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
@@ -13,84 +13,14 @@
 namespace txt {
 
 std::vector<std::string> GetDefaultFontFamilies() {
-#ifdef FLUTTER_USE_FONTCONFIG
-  return {"TizenDefaultFont"};
-#else
-  return {
-      "SamsungOneUI",
-      "SamsungOneUIArabic",
-      "SamsungOneUIArmenian",
-      "SamsungOneUIBangla",
-      "SamsungOneUIDevanagari",
-      "SamsungOneUIEthiopic",
-      "SamsungOneUIFallback",
-      "SamsungOneUIGeorgian",
-      "SamsungOneUIGujarati",
-      "SamsungOneUIGurmukhi",
-      "SamsungOneUIHebrew",
-      "SamsungOneUIJP",
-      "SamsungOneUIKannada",
-      "SamsungOneUIKhmer",
-      "SamsungOneUIKorean",
-      "SamsungOneUIKoreanH",
-      "SamsungOneUILao",
-      "SamsungOneUIMalayalam",
-      "SamsungOneUIMyanmar",
-      "SamsungOneUIOdia",
-      "SamsungOneUIOlChiki",
-      "SamsungOneUISCN",
-      "SamsungOneUISinhala",
-      "SamsungOneUITCN",
-      "SamsungOneUITagalog",
-      "SamsungOneUITamil",
-      "SamsungOneUITelugu",
-      "SamsungOneUIThai",
-      "SamsungOneFallback",
-      "SECEmoji",
-      "BreezeSans",
-      "BreezeSansArabic",
-      "BreezeSansArmenian",
-      "BreezeSansBengali",
-      "BreezeSansChinese",
-      "BreezeSansEthiopic",
-      "BreezeSansGeorgian",
-      "BreezeSansGujarathi",
-      "BreezeSansHebrew",
-      "BreezeSansHindi",
-      "BreezeSansJapanese",
-      "BreezeSansKannada",
-      "BreezeSansKhmer",
-      "BreezeSansKorean",
-      "BreezeSansLao",
-      "BreezeSansMalayalam",
-      "BreezeSansMeeteiMayek",
-      "BreezeSansMyanmar",
-      "BreezeSansOriya",
-      "BreezeSansPunjabi",
-      "BreezeSansSinhala",
-      "BreezeSansTamilBreezeSansTamil",
-      "BreezeSansTelugu",
-      "BreezeSansThai",
-      "BreezeSansTibetan",
-      "BreezeSansFallback",
-      "BreezeColorEmoji",
-  };
-#endif
+  return {"TizenDefaultFont", "SamsungOneUI"};
 }
 
 sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
 #ifdef FLUTTER_USE_FONTCONFIG
   return SkFontMgr::RefDefault();
 #else
-  return SkFontMgr_New_Custom_Directory("/usr/share/fonts");
-#endif
-}
-
-sk_sp<SkFontMgr> GetFallbackFontManager(uint32_t font_initialization_data) {
-#ifdef FLUTTER_USE_FONTCONFIG
-  return nullptr;
-#else
-  return SkFontMgr_New_Custom_Directory("/usr/share/fallback_fonts");
+  return SkFontMgr_New_Custom_Directory("/usr/share/fonts/");
 #endif
 }