From 5d753b704336c1dca8ba967df70c2cb459bb007e Mon Sep 17 00:00:00 2001
From: LongCat is Looong <31859944+LongCatIsLooong@users.noreply.github.com>
Date: Wed, 15 Mar 2023 18:22:16 -0700
Subject: [PATCH] remove temporary flag and make FlutterTest the default font
 for real

---
 runtime/test_font_data.cc | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/runtime/test_font_data.cc b/runtime/test_font_data.cc
index 462b1440258aa..3dbe58f2548bd 100644
--- a/runtime/test_font_data.cc
+++ b/runtime/test_font_data.cc
@@ -1621,19 +1621,10 @@ namespace flutter {
 std::vector<sk_sp<SkTypeface>> GetTestFontData() {
   std::vector<sk_sp<SkTypeface>> typefaces;
 #if EMBED_TEST_FONT_DATA
-  const bool defaultsToAhem =
-      std::getenv("FLUTTER_ROOT") && !std::getenv("USE_FLUTTER_TEST_FONT");
-  if (defaultsToAhem) {
-    typefaces.push_back(SkTypeface::MakeFromStream(
-        SkMemoryStream::MakeDirect(kAhemFont, kAhemFontLength)));
-    typefaces.push_back(SkTypeface::MakeFromStream(
-        SkMemoryStream::MakeDirect(kFlutterTestFont, kFlutterTestFontLength)));
-  } else {
-    typefaces.push_back(SkTypeface::MakeFromStream(
-        SkMemoryStream::MakeDirect(kFlutterTestFont, kFlutterTestFontLength)));
-    typefaces.push_back(SkTypeface::MakeFromStream(
-        SkMemoryStream::MakeDirect(kAhemFont, kAhemFontLength)));
-  }
+  typefaces.push_back(SkTypeface::MakeFromStream(
+      SkMemoryStream::MakeDirect(kFlutterTestFont, kFlutterTestFontLength)));
+  typefaces.push_back(SkTypeface::MakeFromStream(
+      SkMemoryStream::MakeDirect(kAhemFont, kAhemFontLength)));
   typefaces.push_back(SkTypeface::MakeFromStream(
       SkMemoryStream::MakeDirect(kCoughFont, kCoughFontLength)));
 #endif  // EMBED_TEST_FONT_DATA
@@ -1643,13 +1634,7 @@ std::vector<sk_sp<SkTypeface>> GetTestFontData() {
 std::vector<std::string> GetTestFontFamilyNames() {
   std::vector<std::string> names;
 #if EMBED_TEST_FONT_DATA
-  const bool defaultsToAhem =
-      std::getenv("FLUTTER_ROOT") && !std::getenv("USE_FLUTTER_TEST_FONT");
-  if (defaultsToAhem) {
-    names = {"Ahem", "FlutterTest", "Cough"};
-  } else {
-    names = {"FlutterTest", "Ahem", "Cough"};
-  }
+  names = {"FlutterTest", "Ahem", "Cough"};
 #endif  // EMBED_TEST_FONT_DATA
   return names;
 }