Skip to content

Revert #78 #69 #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 23, 2021
Merged

Revert #78 #69 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d74486
Revert "Create fallback font manager to solve performance drops (#78)"
bbrto21 Jun 22, 2021
cf361f2
Revert "Fix font breaking issues (#69)"
bbrto21 Jun 22, 2021
0cad48a
Add SamsungOneUI to DefaultFontFamilies
bbrto21 Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions third_party/txt/src/txt/font_collection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ size_t FontCollection::GetFontManagersCount() const {

void FontCollection::SetupDefaultFontManager() {
default_font_manager_ = GetDefaultFontManager();
fallback_font_manager_ = GetFallbackFontManager();
}

void FontCollection::SetDefaultFontManager(sk_sp<SkFontMgr> font_manager) {
Expand Down Expand Up @@ -145,8 +144,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;
}

Expand Down Expand Up @@ -190,6 +187,7 @@ FontCollection::GetMinikinFontCollectionForFamilies(
FindFontFamilyInManagers(family);
if (minikin_family != nullptr) {
minikin_families.push_back(minikin_family);
break;
}
}
}
Expand Down
1 change: 0 additions & 1 deletion third_party/txt/src/txt/font_collection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
4 changes: 0 additions & 4 deletions third_party/txt/src/txt/platform.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,4 @@ sk_sp<SkFontMgr> GetDefaultFontManager() {
return SkFontMgr::RefDefault();
}

sk_sp<SkFontMgr> GetFallbackFontManager() {
return nullptr;
}

} // namespace txt
2 changes: 0 additions & 2 deletions third_party/txt/src/txt/platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ std::vector<std::string> GetDefaultFontFamilies();

sk_sp<SkFontMgr> GetDefaultFontManager();

sk_sp<SkFontMgr> GetFallbackFontManager();

} // namespace txt

#endif // TXT_PLATFORM_H_
74 changes: 2 additions & 72 deletions third_party/txt/src/txt/platform_linux.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
#ifdef FLUTTER_USE_FONTCONFIG
return SkFontMgr::RefDefault();
#else
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");
return SkFontMgr_New_Custom_Directory("/usr/share/fonts/");
#endif
}

Expand Down