Skip to content
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

Create fallback font manager to solve performance drops #78

Merged
merged 1 commit into from
Apr 29, 2021
Merged

Create fallback font manager to solve performance drops #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 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,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) {
Expand Down Expand Up @@ -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;
}

Expand Down
1 change: 1 addition & 0 deletions 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,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_;
Expand Down
4 changes: 4 additions & 0 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,4 +14,8 @@ sk_sp<SkFontMgr> GetDefaultFontManager() {
return SkFontMgr::RefDefault();
}

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

} // namespace txt
2 changes: 2 additions & 0 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,6 +17,8 @@ std::vector<std::string> GetDefaultFontFamilies();

sk_sp<SkFontMgr> GetDefaultFontManager();

sk_sp<SkFontMgr> GetFallbackFontManager();

} // namespace txt

#endif // TXT_PLATFORM_H_
10 changes: 9 additions & 1 deletion 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 @@ -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
}

Expand Down