From 71e7d8e96e094ba01a3a932959fe5cb94ffe1087 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Thu, 4 Mar 2021 15:34:01 -0800 Subject: [PATCH] SkParagraph: support multiple default font families (flutter/engine#24662) --- .../src/flutter/third_party/txt/src/txt/font_collection.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/engine/src/flutter/third_party/txt/src/txt/font_collection.cc b/engine/src/flutter/third_party/txt/src/txt/font_collection.cc index 353a10e51c0..d9b00807a3e 100644 --- a/engine/src/flutter/third_party/txt/src/txt/font_collection.cc +++ b/engine/src/flutter/third_party/txt/src/txt/font_collection.cc @@ -393,8 +393,12 @@ FontCollection::CreateSktFontCollection() { if (!skt_collection_) { skt_collection_ = sk_make_sp(); + std::vector default_font_families; + for (const std::string& family : GetDefaultFontFamilies()) { + default_font_families.emplace_back(family); + } skt_collection_->setDefaultFontManager(default_font_manager_, - GetDefaultFontFamilies()[0].c_str()); + default_font_families); skt_collection_->setAssetFontManager(asset_font_manager_); skt_collection_->setDynamicFontManager(dynamic_font_manager_); skt_collection_->setTestFontManager(test_font_manager_);