DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not assume that createTypeface is called before getStyle in the AssetManagerFontStyleSet (flutter/engine#14343)

Browse Source
This commit is contained in:
Jason Simmons 2019-12-13 09:23:08 -08:00 committed by GitHub
parent 879d79695a
commit 4dc714b8a4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/src/flutter/lib/ui/text/asset_manager_font_provider.cc
View File

@ -84,7 +84,10 @@ void AssetManagerFontStyleSet::getStyle(int index,
SkString* name) {
FML_DCHECK(index < static_cast<int>(assets_.size()));
if (style) {
*style = assets_[index].typeface->fontStyle();
sk_sp<SkTypeface> typeface(createTypeface(index));
if (typeface) {
*style = typeface->fontStyle();
}
}
if (name) {
*name = family_name_.c_str();