diff --git a/engine/src/flutter/shell/common/engine.cc b/engine/src/flutter/shell/common/engine.cc index 56c55310e7..ef3369347e 100644 --- a/engine/src/flutter/shell/common/engine.cc +++ b/engine/src/flutter/shell/common/engine.cc @@ -90,10 +90,10 @@ bool Engine::UpdateAssetManager( } // Using libTXT as the text engine. + font_collection_.RegisterFonts(asset_manager_); + if (settings_.use_test_fonts) { font_collection_.RegisterTestFonts(); - } else { - font_collection_.RegisterFonts(asset_manager_); } return true; 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 71e6a5178e..2be51f6312 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 @@ -95,12 +95,12 @@ void FontCollection::SetTestFontManager(sk_sp font_manager) { // Return the available font managers in the order they should be queried. std::vector> FontCollection::GetFontManagerOrder() const { std::vector> order; - if (test_font_manager_) - order.push_back(test_font_manager_); if (dynamic_font_manager_) order.push_back(dynamic_font_manager_); if (asset_font_manager_) order.push_back(asset_font_manager_); + if (test_font_manager_) + order.push_back(test_font_manager_); if (default_font_manager_) order.push_back(default_font_manager_); return order;