From 4dc714b8a4874cbfe71a962388c8cba530e572d4 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Fri, 13 Dec 2019 09:23:08 -0800
Subject: [PATCH] Do not assume that createTypeface is called before getStyle
 in the AssetManagerFontStyleSet (flutter/engine#14343)

---
 .../src/flutter/lib/ui/text/asset_manager_font_provider.cc   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engine/src/flutter/lib/ui/text/asset_manager_font_provider.cc b/engine/src/flutter/lib/ui/text/asset_manager_font_provider.cc
index 07a4a66f2f2..805376dd313 100644
--- a/engine/src/flutter/lib/ui/text/asset_manager_font_provider.cc
+++ b/engine/src/flutter/lib/ui/text/asset_manager_font_provider.cc
@@ -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();