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

Use Skia's CSS3 style matcher for dynamically loaded font sets (flutter/engine#15468)

Browse Source 
This will improve font matching for SkParagraph, which relies on the
FontStyleSet's matchStyle implementation to find the closest match for a
FontStyle.
This commit is contained in:
Jason Simmons 2020-01-13 17:35:56 -08:00 committed by GitHub
parent 364bff1c1b
commit 0a68d8b149
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
engine/src/flutter/third_party/txt/src/txt/typeface_font_asset_provider.cc vendored
View File

@ -92,8 +92,16 @@ int TypefaceFontStyleSet::count() {
return typefaces_.size();
}
void TypefaceFontStyleSet::getStyle(int index, SkFontStyle*, SkString* style) {
FML_DCHECK(false);
void TypefaceFontStyleSet::getStyle(int index,
SkFontStyle* style,
SkString* name) {
FML_DCHECK(static_cast<size_t>(index) < typefaces_.size());
if (style) {
*style = typefaces_[index]->fontStyle();
}
if (name) {
name->reset();
}
}
SkTypeface* TypefaceFontStyleSet::createTypeface(int i) {
@ -105,14 +113,7 @@ SkTypeface* TypefaceFontStyleSet::createTypeface(int i) {
}
SkTypeface* TypefaceFontStyleSet::matchStyle(const SkFontStyle& pattern) {
if (typefaces_.empty())
return nullptr;
for (const sk_sp<SkTypeface>& typeface : typefaces_)
if (typeface->fontStyle() == pattern)
return SkRef(typeface.get());
return SkRef(typefaces_[0].get());
return matchStyleCSS3(pattern);
}
} // namespace txt

2
engine/src/flutter/third_party/txt/src/txt/typeface_font_asset_provider.h vendored
View File

@ -39,7 +39,7 @@ class TypefaceFontStyleSet : public SkFontStyleSet {
int count() override;
// |SkFontStyleSet|
void getStyle(int index, SkFontStyle*, SkString* style) override;
void getStyle(int index, SkFontStyle* style, SkString* name) override;
// |SkFontStyleSet|
SkTypeface* createTypeface(int index) override;