From 971a196528a39842a6eabd918c18a260a2048e4c Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Tue, 12 Dec 2023 10:16:08 -0800
Subject: [PATCH 01/16] Register lightweight

---
 third_party/txt/src/txt/platform_mac.mm | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index 3a747d3304823..7bd9327e145ae 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -26,9 +26,14 @@
 static const std::string kSFProDisplayName = "CupertinoSystemDisplay";
 // Font name represents the "SF Pro Text" system font on Apple platforms.
 static const std::string kSFProTextName = "CupertinoSystemText";
+// Font weight representing Regular
+float kNormalWeightValue = 400;
+
 
 namespace txt {
 
+const FourCharCode kWeightTag = 'wght';
+
 std::vector<std::string> GetDefaultFontFamilies() {
   if (fml::IsPlatformVersionAtLeast(9)) {
     return {[FONT_CLASS systemFontOfSize:14].familyName.UTF8String};
@@ -42,6 +47,42 @@
   return mgr;
 }
 
+CTFontRef MatchSystemUIFont(float desired_weight, float size) {
+  CTFontRef ct_font(
+      CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, size, nullptr));
+
+  if (desired_weight == kNormalWeightValue) {
+    return ct_font;
+  }
+
+  CFMutableDictionaryRef variations(CFDictionaryCreateMutable(
+      kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks,
+      &kCFTypeDictionaryValueCallBacks));
+
+  auto add_axis_to_variations = [&variations](const FourCharCode tag,
+                                              float desired_value,
+                                              float normal_value) {
+    if (desired_value != normal_value) {
+      CFNumberRef tag_number(
+          CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &tag));
+      CFNumberRef value_number(CFNumberCreate(
+          kCFAllocatorDefault, kCFNumberFloatType, &desired_value));
+      CFDictionarySetValue(variations, tag_number, value_number);
+    }
+  };
+  add_axis_to_variations(kWeightTag, desired_weight, kNormalWeightValue);
+
+  CFMutableDictionaryRef attributes(CFDictionaryCreateMutable(
+      kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks,
+      &kCFTypeDictionaryValueCallBacks));
+  CFDictionarySetValue(attributes, kCTFontVariationAttribute, variations);
+
+  CTFontDescriptorRef var_font_desc(
+      CTFontDescriptorCreateWithAttributes(attributes));
+
+  return CTFontCreateCopyWithAttributes(ct_font, size, nullptr, var_font_desc);
+}
+
 void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   // iOS loads different system fonts when size is greater than 28 or lower
   // than 17. The "familyName" property returned from CoreText stays the same
@@ -63,6 +104,12 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
     dynamic_font_manager.font_provider().RegisterTypeface(large_system_font,
                                                           kSFProDisplayName);
   }
+  sk_sp<SkTypeface> large_system_font_lightweight = SkMakeTypefaceFromCTFont(
+      (CTFontRef)CFAutorelease(MatchSystemUIFont(0, kSFProDisplayBreakPoint)));
+  if (large_system_font_lightweight) {
+    dynamic_font_manager.font_provider().RegisterTypeface(
+      large_system_font_lightweight, "CupertinoSystemDisplayw100");
+  }
   sk_sp<SkTypeface> regular_system_font = SkMakeTypefaceFromCTFont(
       (CTFontRef)CFAutorelease(CTFontCreateUIFontForLanguage(
           kCTFontUIFontSystem, kSFProTextBreakPoint, NULL)));

From 176ad4c01207ef6e7285d0776e29e6162cc038da Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Tue, 12 Dec 2023 10:18:28 -0800
Subject: [PATCH 02/16] Formatting

---
 third_party/txt/src/txt/platform_mac.mm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index 7bd9327e145ae..257261ab0a5fe 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -29,7 +29,6 @@
 // Font weight representing Regular
 float kNormalWeightValue = 400;
 
-
 namespace txt {
 
 const FourCharCode kWeightTag = 'wght';
@@ -108,7 +107,7 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
       (CTFontRef)CFAutorelease(MatchSystemUIFont(0, kSFProDisplayBreakPoint)));
   if (large_system_font_lightweight) {
     dynamic_font_manager.font_provider().RegisterTypeface(
-      large_system_font_lightweight, "CupertinoSystemDisplayw100");
+        large_system_font_lightweight, "CupertinoSystemDisplayw100");
   }
   sk_sp<SkTypeface> regular_system_font = SkMakeTypefaceFromCTFont(
       (CTFontRef)CFAutorelease(CTFontCreateUIFontForLanguage(

From f4811277d4c43eebf592b99c52228952b83fe865 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Tue, 12 Dec 2023 16:38:41 -0800
Subject: [PATCH 03/16] Add loop through font weights

---
 lib/ui/text.dart                              |  9 +++++++-
 lib/ui/text/font_collection.h                 |  2 ++
 third_party/txt/src/txt/asset_font_manager.cc | 22 ++++++++++++++-----
 third_party/txt/src/txt/font_collection.h     |  1 +
 third_party/txt/src/txt/platform_mac.mm       | 22 ++++++++++++++-----
 5 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/lib/ui/text.dart b/lib/ui/text.dart
index 374011ea45c66..0a16be26956d1 100644
--- a/lib/ui/text.dart
+++ b/lib/ui/text.dart
@@ -19,6 +19,13 @@ enum FontStyle {
   italic,
 }
 
+String? _proxySystemFont(String? fontFamily, FontWeight? fontWeight) {
+  if (fontFamily != null && fontFamily == 'CupertinoSystemText' || fontFamily == 'CupertinoSystemDisplay') {
+    return fontFamily! + (fontWeight!= null ? fontWeight.toString().substring(11) :'');
+  }
+  return fontFamily;
+}
+
 /// The thickness of the glyphs used to draw the text.
 ///
 /// Fonts are typically weighted on a 9-point scale, which, for historical
@@ -1742,7 +1749,7 @@ class TextStyle {
          fontVariations,
        ),
        _leadingDistribution = leadingDistribution,
-       _fontFamily = fontFamily ?? '',
+       _fontFamily = _proxySystemFont(fontFamily, fontWeight) ?? '',
        _fontFamilyFallback = fontFamilyFallback,
        _fontSize = fontSize,
        _letterSpacing = letterSpacing,
diff --git a/lib/ui/text/font_collection.h b/lib/ui/text/font_collection.h
index 9c8d41f3ba773..b268083b64fb9 100644
--- a/lib/ui/text/font_collection.h
+++ b/lib/ui/text/font_collection.h
@@ -34,6 +34,8 @@ class FontCollection {
                                Dart_Handle callback,
                                const std::string& family_name);
 
+  // sk_sp<SkTypeface> FontCollection::matchTypeface(const SkString& familyName, SkFontStyle fontStyle) override;
+
  private:
   std::shared_ptr<txt::FontCollection> collection_;
   sk_sp<txt::DynamicFontManager> dynamic_font_manager_;
diff --git a/third_party/txt/src/txt/asset_font_manager.cc b/third_party/txt/src/txt/asset_font_manager.cc
index c9952e85e8dad..ffe42c881d19b 100644
--- a/third_party/txt/src/txt/asset_font_manager.cc
+++ b/third_party/txt/src/txt/asset_font_manager.cc
@@ -54,11 +54,23 @@ sk_sp<SkFontStyleSet> AssetFontManager::onMatchFamily(
 sk_sp<SkTypeface> AssetFontManager::onMatchFamilyStyle(
     const char familyName[],
     const SkFontStyle& style) const {
-  sk_sp<SkFontStyleSet> font_style_set =
-      font_provider_->MatchFamily(std::string(familyName));
-  if (font_style_set == nullptr)
-    return nullptr;
-  return font_style_set->matchStyle(style);
+// #if FML_OS_MACOSX || FML_OS_IOS
+  // if (strcmp(familyName, "CupertinoSystemText") == 0 || strcmp(familyName, "CupertinoSystemDisplay") == 0) {
+    // sk_sp<SkFontStyleSet> font_style_set =
+    //   font_provider_->MatchFamily(std::string(familyName) + "w" + std::to_string(style.weight()));
+    const std::string local_font_name = std::string(familyName) + "w200";
+    sk_sp<SkFontStyleSet> font_style_set =
+      font_provider_->MatchFamily(std::string(local_font_name));
+    if (font_style_set == nullptr)
+      return nullptr;
+    return font_style_set->matchStyle(style);
+  // }
+// #endif
+  // sk_sp<SkFontStyleSet> font_style_set =
+  //     font_provider_->MatchFamily(std::string(familyName));
+  // if (font_style_set == nullptr)
+  //   return nullptr;
+  // return font_style_set->matchStyle(style);
 }
 
 sk_sp<SkTypeface> AssetFontManager::onMatchFamilyStyleCharacter(
diff --git a/third_party/txt/src/txt/font_collection.h b/third_party/txt/src/txt/font_collection.h
index 08631bef8a142..32078414bf2ee 100644
--- a/third_party/txt/src/txt/font_collection.h
+++ b/third_party/txt/src/txt/font_collection.h
@@ -56,6 +56,7 @@ class FontCollection : public std::enable_shared_from_this<FontCollection> {
   // Construct a Skia text layout FontCollection based on this collection.
   sk_sp<skia::textlayout::FontCollection> CreateSktFontCollection();
 
+
  private:
   sk_sp<SkFontMgr> default_font_manager_;
   sk_sp<SkFontMgr> asset_font_manager_;
diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index 257261ab0a5fe..f76c8a6437a5b 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -103,11 +103,14 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
     dynamic_font_manager.font_provider().RegisterTypeface(large_system_font,
                                                           kSFProDisplayName);
   }
-  sk_sp<SkTypeface> large_system_font_lightweight = SkMakeTypefaceFromCTFont(
-      (CTFontRef)CFAutorelease(MatchSystemUIFont(0, kSFProDisplayBreakPoint)));
-  if (large_system_font_lightweight) {
-    dynamic_font_manager.font_provider().RegisterTypeface(
-        large_system_font_lightweight, "CupertinoSystemDisplayw100");
+  for (int i = 0; i < 9; i++) {
+    const int font_weight = i * 100;
+    sk_sp<SkTypeface> large_system_font_weighted = SkMakeTypefaceFromCTFont(
+      (CTFontRef)CFAutorelease(MatchSystemUIFont(font_weight, kSFProDisplayBreakPoint)));
+    if (large_system_font_weighted) {
+      dynamic_font_manager.font_provider().RegisterTypeface(
+          large_system_font_weighted, kSFProDisplayName + "w" + std::to_string(font_weight + 100));
+    }
   }
   sk_sp<SkTypeface> regular_system_font = SkMakeTypefaceFromCTFont(
       (CTFontRef)CFAutorelease(CTFontCreateUIFontForLanguage(
@@ -116,6 +119,15 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
     dynamic_font_manager.font_provider().RegisterTypeface(regular_system_font,
                                                           kSFProTextName);
   }
+  for (int i = 0; i < 9; i++) {
+    const int font_weight = i * 100;
+    sk_sp<SkTypeface> large_system_font_weighted = SkMakeTypefaceFromCTFont(
+      (CTFontRef)CFAutorelease(MatchSystemUIFont(font_weight, kSFProTextBreakPoint)));
+    if (large_system_font_weighted) {
+      dynamic_font_manager.font_provider().RegisterTypeface(
+          large_system_font_weighted, kSFProTextName + "w" + std::to_string(font_weight + 100));
+    }
+  }
 }
 
 }  // namespace txt

From 2751004d583425c00553a8ba8d9f5c7fbd920126 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Tue, 12 Dec 2023 16:41:40 -0800
Subject: [PATCH 04/16] Formatting

---
 lib/ui/text/font_collection.h                 |  3 ++-
 third_party/txt/src/txt/asset_font_manager.cc | 21 ++++++++++---------
 third_party/txt/src/txt/font_collection.h     |  1 -
 third_party/txt/src/txt/platform_mac.mm       | 16 ++++++++------
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/lib/ui/text/font_collection.h b/lib/ui/text/font_collection.h
index b268083b64fb9..59df1a0789544 100644
--- a/lib/ui/text/font_collection.h
+++ b/lib/ui/text/font_collection.h
@@ -34,7 +34,8 @@ class FontCollection {
                                Dart_Handle callback,
                                const std::string& family_name);
 
-  // sk_sp<SkTypeface> FontCollection::matchTypeface(const SkString& familyName, SkFontStyle fontStyle) override;
+  // sk_sp<SkTypeface> FontCollection::matchTypeface(const SkString& familyName,
+  // SkFontStyle fontStyle) override;
 
  private:
   std::shared_ptr<txt::FontCollection> collection_;
diff --git a/third_party/txt/src/txt/asset_font_manager.cc b/third_party/txt/src/txt/asset_font_manager.cc
index ffe42c881d19b..76059138bb53e 100644
--- a/third_party/txt/src/txt/asset_font_manager.cc
+++ b/third_party/txt/src/txt/asset_font_manager.cc
@@ -54,18 +54,19 @@ sk_sp<SkFontStyleSet> AssetFontManager::onMatchFamily(
 sk_sp<SkTypeface> AssetFontManager::onMatchFamilyStyle(
     const char familyName[],
     const SkFontStyle& style) const {
-// #if FML_OS_MACOSX || FML_OS_IOS
-  // if (strcmp(familyName, "CupertinoSystemText") == 0 || strcmp(familyName, "CupertinoSystemDisplay") == 0) {
-    // sk_sp<SkFontStyleSet> font_style_set =
-    //   font_provider_->MatchFamily(std::string(familyName) + "w" + std::to_string(style.weight()));
-    const std::string local_font_name = std::string(familyName) + "w200";
-    sk_sp<SkFontStyleSet> font_style_set =
+  // #if FML_OS_MACOSX || FML_OS_IOS
+  // if (strcmp(familyName, "CupertinoSystemText") == 0 || strcmp(familyName,
+  // "CupertinoSystemDisplay") == 0) { sk_sp<SkFontStyleSet> font_style_set =
+  //   font_provider_->MatchFamily(std::string(familyName) + "w" +
+  //   std::to_string(style.weight()));
+  const std::string local_font_name = std::string(familyName) + "w200";
+  sk_sp<SkFontStyleSet> font_style_set =
       font_provider_->MatchFamily(std::string(local_font_name));
-    if (font_style_set == nullptr)
-      return nullptr;
-    return font_style_set->matchStyle(style);
+  if (font_style_set == nullptr)
+    return nullptr;
+  return font_style_set->matchStyle(style);
   // }
-// #endif
+  // #endif
   // sk_sp<SkFontStyleSet> font_style_set =
   //     font_provider_->MatchFamily(std::string(familyName));
   // if (font_style_set == nullptr)
diff --git a/third_party/txt/src/txt/font_collection.h b/third_party/txt/src/txt/font_collection.h
index 32078414bf2ee..08631bef8a142 100644
--- a/third_party/txt/src/txt/font_collection.h
+++ b/third_party/txt/src/txt/font_collection.h
@@ -56,7 +56,6 @@ class FontCollection : public std::enable_shared_from_this<FontCollection> {
   // Construct a Skia text layout FontCollection based on this collection.
   sk_sp<skia::textlayout::FontCollection> CreateSktFontCollection();
 
-
  private:
   sk_sp<SkFontMgr> default_font_manager_;
   sk_sp<SkFontMgr> asset_font_manager_;
diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index f76c8a6437a5b..47169b79a782f 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -105,11 +105,13 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   }
   for (int i = 0; i < 9; i++) {
     const int font_weight = i * 100;
-    sk_sp<SkTypeface> large_system_font_weighted = SkMakeTypefaceFromCTFont(
-      (CTFontRef)CFAutorelease(MatchSystemUIFont(font_weight, kSFProDisplayBreakPoint)));
+    sk_sp<SkTypeface> large_system_font_weighted =
+        SkMakeTypefaceFromCTFont((CTFontRef)CFAutorelease(
+            MatchSystemUIFont(font_weight, kSFProDisplayBreakPoint)));
     if (large_system_font_weighted) {
       dynamic_font_manager.font_provider().RegisterTypeface(
-          large_system_font_weighted, kSFProDisplayName + "w" + std::to_string(font_weight + 100));
+          large_system_font_weighted,
+          kSFProDisplayName + "w" + std::to_string(font_weight + 100));
     }
   }
   sk_sp<SkTypeface> regular_system_font = SkMakeTypefaceFromCTFont(
@@ -121,11 +123,13 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   }
   for (int i = 0; i < 9; i++) {
     const int font_weight = i * 100;
-    sk_sp<SkTypeface> large_system_font_weighted = SkMakeTypefaceFromCTFont(
-      (CTFontRef)CFAutorelease(MatchSystemUIFont(font_weight, kSFProTextBreakPoint)));
+    sk_sp<SkTypeface> large_system_font_weighted =
+        SkMakeTypefaceFromCTFont((CTFontRef)CFAutorelease(
+            MatchSystemUIFont(font_weight, kSFProTextBreakPoint)));
     if (large_system_font_weighted) {
       dynamic_font_manager.font_provider().RegisterTypeface(
-          large_system_font_weighted, kSFProTextName + "w" + std::to_string(font_weight + 100));
+          large_system_font_weighted,
+          kSFProTextName + "w" + std::to_string(font_weight + 100));
     }
   }
 }

From 70327ca535382c17f83e76adad52e07f49e070a4 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 10:58:24 -0800
Subject: [PATCH 05/16] Register under one family name, remove extra code

---
 lib/ui/text.dart                        |  2 +-
 lib/ui/text/font_collection.h           |  2 --
 third_party/txt/src/txt/platform_mac.mm | 29 +------------------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/lib/ui/text.dart b/lib/ui/text.dart
index 0a16be26956d1..255b652526c35 100644
--- a/lib/ui/text.dart
+++ b/lib/ui/text.dart
@@ -1749,7 +1749,7 @@ class TextStyle {
          fontVariations,
        ),
        _leadingDistribution = leadingDistribution,
-       _fontFamily = _proxySystemFont(fontFamily, fontWeight) ?? '',
+       _fontFamily = fontFamily ?? '',
        _fontFamilyFallback = fontFamilyFallback,
        _fontSize = fontSize,
        _letterSpacing = letterSpacing,
diff --git a/lib/ui/text/font_collection.h b/lib/ui/text/font_collection.h
index 59df1a0789544..0c75f7eeca621 100644
--- a/lib/ui/text/font_collection.h
+++ b/lib/ui/text/font_collection.h
@@ -34,8 +34,6 @@ class FontCollection {
                                Dart_Handle callback,
                                const std::string& family_name);
 
-  // sk_sp<SkTypeface> FontCollection::matchTypeface(const SkString& familyName,
-  // SkFontStyle fontStyle) override;
 
  private:
   std::shared_ptr<txt::FontCollection> collection_;
diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index 47169b79a782f..7d043e6710efe 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -20,8 +20,6 @@
 
 // Apple system font larger than size 29 returns SFProDisplay typeface.
 static const CGFloat kSFProDisplayBreakPoint = 29;
-// Apple system font smaller than size 16 returns SFProText typeface.
-static const CGFloat kSFProTextBreakPoint = 16;
 // Font name represents the "SF Pro Display" system font on Apple platforms.
 static const std::string kSFProDisplayName = "CupertinoSystemDisplay";
 // Font name represents the "SF Pro Text" system font on Apple platforms.
@@ -96,13 +94,6 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   //
   // See https://www.wwdcnotes.com/notes/wwdc20/10175/ for Apple's document on
   // this topic.
-  sk_sp<SkTypeface> large_system_font = SkMakeTypefaceFromCTFont(
-      (CTFontRef)CFAutorelease(CTFontCreateUIFontForLanguage(
-          kCTFontUIFontSystem, kSFProDisplayBreakPoint, NULL)));
-  if (large_system_font) {
-    dynamic_font_manager.font_provider().RegisterTypeface(large_system_font,
-                                                          kSFProDisplayName);
-  }
   for (int i = 0; i < 9; i++) {
     const int font_weight = i * 100;
     sk_sp<SkTypeface> large_system_font_weighted =
@@ -111,25 +102,7 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
     if (large_system_font_weighted) {
       dynamic_font_manager.font_provider().RegisterTypeface(
           large_system_font_weighted,
-          kSFProDisplayName + "w" + std::to_string(font_weight + 100));
-    }
-  }
-  sk_sp<SkTypeface> regular_system_font = SkMakeTypefaceFromCTFont(
-      (CTFontRef)CFAutorelease(CTFontCreateUIFontForLanguage(
-          kCTFontUIFontSystem, kSFProTextBreakPoint, NULL)));
-  if (regular_system_font) {
-    dynamic_font_manager.font_provider().RegisterTypeface(regular_system_font,
-                                                          kSFProTextName);
-  }
-  for (int i = 0; i < 9; i++) {
-    const int font_weight = i * 100;
-    sk_sp<SkTypeface> large_system_font_weighted =
-        SkMakeTypefaceFromCTFont((CTFontRef)CFAutorelease(
-            MatchSystemUIFont(font_weight, kSFProTextBreakPoint)));
-    if (large_system_font_weighted) {
-      dynamic_font_manager.font_provider().RegisterTypeface(
-          large_system_font_weighted,
-          kSFProTextName + "w" + std::to_string(font_weight + 100));
+          kSFProDisplayName);
     }
   }
 }

From ffc14b6846ec9c1778d569e352428fb13a3d4966 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 10:59:25 -0800
Subject: [PATCH 06/16] formatting

---
 lib/ui/text/font_collection.h           | 1 -
 third_party/txt/src/txt/platform_mac.mm | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/ui/text/font_collection.h b/lib/ui/text/font_collection.h
index 0c75f7eeca621..9c8d41f3ba773 100644
--- a/lib/ui/text/font_collection.h
+++ b/lib/ui/text/font_collection.h
@@ -34,7 +34,6 @@ class FontCollection {
                                Dart_Handle callback,
                                const std::string& family_name);
 
-
  private:
   std::shared_ptr<txt::FontCollection> collection_;
   sk_sp<txt::DynamicFontManager> dynamic_font_manager_;
diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index 7d043e6710efe..121e5702f0625 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -101,8 +101,7 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
             MatchSystemUIFont(font_weight, kSFProDisplayBreakPoint)));
     if (large_system_font_weighted) {
       dynamic_font_manager.font_provider().RegisterTypeface(
-          large_system_font_weighted,
-          kSFProDisplayName);
+          large_system_font_weighted, kSFProDisplayName);
     }
   }
 }

From 562afbebfe9d04cf745f5899b108ca8fad686744 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 11:10:59 -0800
Subject: [PATCH 07/16] Remove unneeded code

---
 lib/ui/text.dart                              |  7 -------
 third_party/txt/src/txt/asset_font_manager.cc | 15 +--------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/lib/ui/text.dart b/lib/ui/text.dart
index 255b652526c35..374011ea45c66 100644
--- a/lib/ui/text.dart
+++ b/lib/ui/text.dart
@@ -19,13 +19,6 @@ enum FontStyle {
   italic,
 }
 
-String? _proxySystemFont(String? fontFamily, FontWeight? fontWeight) {
-  if (fontFamily != null && fontFamily == 'CupertinoSystemText' || fontFamily == 'CupertinoSystemDisplay') {
-    return fontFamily! + (fontWeight!= null ? fontWeight.toString().substring(11) :'');
-  }
-  return fontFamily;
-}
-
 /// The thickness of the glyphs used to draw the text.
 ///
 /// Fonts are typically weighted on a 9-point scale, which, for historical
diff --git a/third_party/txt/src/txt/asset_font_manager.cc b/third_party/txt/src/txt/asset_font_manager.cc
index 76059138bb53e..c9952e85e8dad 100644
--- a/third_party/txt/src/txt/asset_font_manager.cc
+++ b/third_party/txt/src/txt/asset_font_manager.cc
@@ -54,24 +54,11 @@ sk_sp<SkFontStyleSet> AssetFontManager::onMatchFamily(
 sk_sp<SkTypeface> AssetFontManager::onMatchFamilyStyle(
     const char familyName[],
     const SkFontStyle& style) const {
-  // #if FML_OS_MACOSX || FML_OS_IOS
-  // if (strcmp(familyName, "CupertinoSystemText") == 0 || strcmp(familyName,
-  // "CupertinoSystemDisplay") == 0) { sk_sp<SkFontStyleSet> font_style_set =
-  //   font_provider_->MatchFamily(std::string(familyName) + "w" +
-  //   std::to_string(style.weight()));
-  const std::string local_font_name = std::string(familyName) + "w200";
   sk_sp<SkFontStyleSet> font_style_set =
-      font_provider_->MatchFamily(std::string(local_font_name));
+      font_provider_->MatchFamily(std::string(familyName));
   if (font_style_set == nullptr)
     return nullptr;
   return font_style_set->matchStyle(style);
-  // }
-  // #endif
-  // sk_sp<SkFontStyleSet> font_style_set =
-  //     font_provider_->MatchFamily(std::string(familyName));
-  // if (font_style_set == nullptr)
-  //   return nullptr;
-  // return font_style_set->matchStyle(style);
 }
 
 sk_sp<SkTypeface> AssetFontManager::onMatchFamilyStyleCharacter(

From 18c7e6d040a762d895243d3803b4cd2119bb88c8 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 15:19:59 -0800
Subject: [PATCH 08/16] Adjust font weight

---
 third_party/txt/src/txt/platform_mac.mm     | 28 ++++++++++++++++-----
 third_party/txt/tests/platform_mac_tests.cc |  5 +---
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index 121e5702f0625..6fc14dda4fff1 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -22,8 +22,6 @@
 static const CGFloat kSFProDisplayBreakPoint = 29;
 // Font name represents the "SF Pro Display" system font on Apple platforms.
 static const std::string kSFProDisplayName = "CupertinoSystemDisplay";
-// Font name represents the "SF Pro Text" system font on Apple platforms.
-static const std::string kSFProTextName = "CupertinoSystemText";
 // Font weight representing Regular
 float kNormalWeightValue = 400;
 
@@ -85,8 +83,10 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   // than 17. The "familyName" property returned from CoreText stays the same
   // despite the typeface is different.
   //
-  // Below code manually loads and registers them as two different fonts
-  // so Flutter app can access them on macOS and iOS.
+  // Below code manually loads and registers the larger font. The existing fallback
+  // correctly loads the smaller font. The code also iterates through the possible
+  // font weights from 100 - 900 to correctly load all of them, as a CTFont object
+  // for the large system font does not include all of the font weights by default.
   //
   // Darwin system fonts from 17 to 28 also have dynamic spacing based on sizes.
   // These two fonts do not match the spacings when sizes are from 17 to 28.
@@ -94,7 +94,7 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   //
   // See https://www.wwdcnotes.com/notes/wwdc20/10175/ for Apple's document on
   // this topic.
-  for (int i = 0; i < 9; i++) {
+  for (int i = 0; i < 8; i++) {
     const int font_weight = i * 100;
     sk_sp<SkTypeface> large_system_font_weighted =
         SkMakeTypefaceFromCTFont((CTFontRef)CFAutorelease(
@@ -104,6 +104,22 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
           large_system_font_weighted, kSFProDisplayName);
     }
   }
-}
+  // The value 780 returns a font weight of 800.
+  sk_sp<SkTypeface> large_system_font_weighted_800 =
+        SkMakeTypefaceFromCTFont((CTFontRef)CFAutorelease(
+            MatchSystemUIFont(780, kSFProDisplayBreakPoint)));
+    if (large_system_font_weighted_800) {
+      dynamic_font_manager.font_provider().RegisterTypeface(
+          large_system_font_weighted_800, kSFProDisplayName);
+    }
+  // The value of 810 returns a font weight of 900.
+  sk_sp<SkTypeface> large_system_font_weighted_900 =
+        SkMakeTypefaceFromCTFont((CTFontRef)CFAutorelease(
+            MatchSystemUIFont(810, kSFProDisplayBreakPoint)));
+    if (large_system_font_weighted_900) {
+      dynamic_font_manager.font_provider().RegisterTypeface(
+          large_system_font_weighted_900, kSFProDisplayName);
+    }
+  }
 
 }  // namespace txt
diff --git a/third_party/txt/tests/platform_mac_tests.cc b/third_party/txt/tests/platform_mac_tests.cc
index 54cea1c1324a1..ffb9edadd99f6 100644
--- a/third_party/txt/tests/platform_mac_tests.cc
+++ b/third_party/txt/tests/platform_mac_tests.cc
@@ -21,13 +21,10 @@ class PlatformMacTests : public ::testing::Test {
 TEST_F(PlatformMacTests, RegisterSystemFonts) {
   DynamicFontManager dynamic_font_manager;
   RegisterSystemFonts(dynamic_font_manager);
-  ASSERT_EQ(dynamic_font_manager.font_provider().GetFamilyCount(), 2ul);
+  ASSERT_EQ(dynamic_font_manager.font_provider().GetFamilyCount(), 1ul);
   ASSERT_NE(dynamic_font_manager.font_provider().MatchFamily(
                 "CupertinoSystemDisplay"),
             nullptr);
-  ASSERT_NE(
-      dynamic_font_manager.font_provider().MatchFamily("CupertinoSystemText"),
-      nullptr);
 }
 
 }  // namespace testing

From bab6f200db6c9662d184a0121bcdc3b9f2dd7729 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 15:20:50 -0800
Subject: [PATCH 09/16] Formatting

---
 third_party/txt/src/txt/platform_mac.mm | 35 ++++++++++++-------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index 6fc14dda4fff1..3a0e3f0010dc2 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -83,10 +83,11 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   // than 17. The "familyName" property returned from CoreText stays the same
   // despite the typeface is different.
   //
-  // Below code manually loads and registers the larger font. The existing fallback
-  // correctly loads the smaller font. The code also iterates through the possible
-  // font weights from 100 - 900 to correctly load all of them, as a CTFont object
-  // for the large system font does not include all of the font weights by default.
+  // Below code manually loads and registers the larger font. The existing
+  // fallback correctly loads the smaller font. The code also iterates through
+  // the possible font weights from 100 - 900 to correctly load all of them, as
+  // a CTFont object for the large system font does not include all of the font
+  // weights by default.
   //
   // Darwin system fonts from 17 to 28 also have dynamic spacing based on sizes.
   // These two fonts do not match the spacings when sizes are from 17 to 28.
@@ -105,21 +106,19 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
     }
   }
   // The value 780 returns a font weight of 800.
-  sk_sp<SkTypeface> large_system_font_weighted_800 =
-        SkMakeTypefaceFromCTFont((CTFontRef)CFAutorelease(
-            MatchSystemUIFont(780, kSFProDisplayBreakPoint)));
-    if (large_system_font_weighted_800) {
-      dynamic_font_manager.font_provider().RegisterTypeface(
-          large_system_font_weighted_800, kSFProDisplayName);
-    }
+  sk_sp<SkTypeface> large_system_font_weighted_800 = SkMakeTypefaceFromCTFont((
+      CTFontRef)CFAutorelease(MatchSystemUIFont(780, kSFProDisplayBreakPoint)));
+  if (large_system_font_weighted_800) {
+    dynamic_font_manager.font_provider().RegisterTypeface(
+        large_system_font_weighted_800, kSFProDisplayName);
+  }
   // The value of 810 returns a font weight of 900.
-  sk_sp<SkTypeface> large_system_font_weighted_900 =
-        SkMakeTypefaceFromCTFont((CTFontRef)CFAutorelease(
-            MatchSystemUIFont(810, kSFProDisplayBreakPoint)));
-    if (large_system_font_weighted_900) {
-      dynamic_font_manager.font_provider().RegisterTypeface(
-          large_system_font_weighted_900, kSFProDisplayName);
-    }
+  sk_sp<SkTypeface> large_system_font_weighted_900 = SkMakeTypefaceFromCTFont((
+      CTFontRef)CFAutorelease(MatchSystemUIFont(810, kSFProDisplayBreakPoint)));
+  if (large_system_font_weighted_900) {
+    dynamic_font_manager.font_provider().RegisterTypeface(
+        large_system_font_weighted_900, kSFProDisplayName);
   }
+}
 
 }  // namespace txt

From c163e5e04c82de6be8b57dacac947e9f29fde963 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 15:53:49 -0800
Subject: [PATCH 10/16] Add check for 9 font counts

---
 third_party/txt/tests/platform_mac_tests.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/third_party/txt/tests/platform_mac_tests.cc b/third_party/txt/tests/platform_mac_tests.cc
index ffb9edadd99f6..76e5de7032faf 100644
--- a/third_party/txt/tests/platform_mac_tests.cc
+++ b/third_party/txt/tests/platform_mac_tests.cc
@@ -25,6 +25,8 @@ TEST_F(PlatformMacTests, RegisterSystemFonts) {
   ASSERT_NE(dynamic_font_manager.font_provider().MatchFamily(
                 "CupertinoSystemDisplay"),
             nullptr);
+  ASSERT_EQ(dynamic_font_manager.font_provider().MatchFamily(
+                "CupertinoSystemDisplay")->count(), 9ul);
 }
 
 }  // namespace testing

From 41de08dbd14c89732c26f5b16930655236fd9ed8 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 15:58:41 -0800
Subject: [PATCH 11/16] Formatting

---
 third_party/txt/tests/platform_mac_tests.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/third_party/txt/tests/platform_mac_tests.cc b/third_party/txt/tests/platform_mac_tests.cc
index 76e5de7032faf..780533e9b225a 100644
--- a/third_party/txt/tests/platform_mac_tests.cc
+++ b/third_party/txt/tests/platform_mac_tests.cc
@@ -25,8 +25,10 @@ TEST_F(PlatformMacTests, RegisterSystemFonts) {
   ASSERT_NE(dynamic_font_manager.font_provider().MatchFamily(
                 "CupertinoSystemDisplay"),
             nullptr);
-  ASSERT_EQ(dynamic_font_manager.font_provider().MatchFamily(
-                "CupertinoSystemDisplay")->count(), 9ul);
+  ASSERT_EQ(dynamic_font_manager.font_provider()
+                .MatchFamily("CupertinoSystemDisplay")
+                ->count(),
+            9ul);
 }
 
 }  // namespace testing

From 47caba541bc24431e84ae9a31a39cb67e9bf437f Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 16:10:55 -0800
Subject: [PATCH 12/16] Convert to int

---
 tools/font-subset/gen/1.ttf         | Bin 0 -> 1024 bytes
 tools/font-subset/gen/1variable.ttf | Bin 0 -> 5172 bytes
 tools/font-subset/gen/2.ttf         | Bin 0 -> 1132 bytes
 tools/font-subset/gen/2variable.ttf | Bin 0 -> 7856 bytes
 tools/font-subset/gen/3.ttf         | Bin 0 -> 1224 bytes
 tools/font-subset/gen/3variable.ttf | Bin 0 -> 10320 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tools/font-subset/gen/1.ttf
 create mode 100644 tools/font-subset/gen/1variable.ttf
 create mode 100644 tools/font-subset/gen/2.ttf
 create mode 100644 tools/font-subset/gen/2variable.ttf
 create mode 100644 tools/font-subset/gen/3.ttf
 create mode 100644 tools/font-subset/gen/3variable.ttf

diff --git a/tools/font-subset/gen/1.ttf b/tools/font-subset/gen/1.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..afeb7c4051d87864742ebdb6a3988b9137b06741
GIT binary patch
literal 1024
zcmaJ<O=}Zj5Po*EjfrhdlV(%X7F_EGvTOX<bW;?Oimm;iB2=~o5$v+vCYGcLO)RY_
z1Qd_rMSp=O1@R(y^llG=h+c$v6R+BvHa_p}9zqdknR%a?d1vOCmxTnN2TepUe(m~c
z^T*`x5+J>0bjhtaHT1L=>Ce$0bvGIslF|h6HdQG)^;)~lN}xrJ70X*IeHRz+0rElm
zt0m7_jz_<`tZ&jUlo(JXS*Cx2{?SsUu_@a~5`UmZ%T?EbMFe~ie#P0W;U>Njf2V3|
zPQ@GgY29c4hwO2;R;@SMk6;qVL|$-X^CWC~LV{irIm!@w%6JXIOduBdv2mR8BVr3m
z`+?~94`ID1>ae0?rvww=zek!@_-QE6cq;tpw-j>m?V&$@Ua+7>K0kgn^yXIL!VcoW
zl#jo*Cz%1yX|mdtAuDuaAqjTmN>9+m;yG!BnW^yHK^A-+8C~H<qD!AJoziS6Ep`wR
z*pN+dM}tAWHVo;d^d3>{#{rB0$3~7@`E+#5I-(9x^8@N(Ys?xg2sJaRn#rgVQrU$;
zMc4JG#_kIvpGys=a(N@0OlCjXwyo=isv4{2Y<Hr!zrQ!pJsUpuKHLy5ro>5L3GYHI
zVHnRtER(~t5JxbNi4ZFtce*eLJ&Z?*fU9uOfQNP5CMshFE~;2V9Xa;!P{bWZ9p)GO
zTXo(Oc@1azU!0+}aK(=_{BxZZ9<!#O)o`A8?+mSDN^qmVY3Hb>-?6Y~^8e~Db9N0|
zKK~+0+(pa|cxjkown|22ayrS(44J!Rrr{D}WuEigC#b9Yp2y9_Yi!Uii$DJ_Luipt

literal 0
HcmV?d00001

diff --git a/tools/font-subset/gen/1variable.ttf b/tools/font-subset/gen/1variable.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0efa2a0315b0ebb6a3207abedf06f9b72d7deee6
GIT binary patch
literal 5172
zcma)9U2I&{5uS7Z@9ui-wRi2cW0Q?-(w2}P5+~3STE_`7l?=Ax7*I(ACJsrcL#)Km
zzyr#<p!OkEE2UCj(>6TORy<WaAY`hR@_>*UsXRbit%9{C!Hw76^?HBq?(H|{uGe<F
zDLvQco|!pw=FH5Q^W8NGB5K4-qgem&NZ$(wf20$s5YiiuJ$c{=-Ae;R;vMikgTp&_
z_x_^)XGF?X@Xrk&J#h4=sh58X{Wrk>W%QNN^AxxVU1bRT(22976BI~1h4nMwdtSi&
z<>J{tVzbA<&z%~*FoCfF^F0`?Q{%6`@YI2(B9RVW>^KGeKfLwc14K6V^!@(y$<eWG
z`p>#yKMMVQry($>)IUM@GWhP(XD2Ue&xzCE_p`n6b0<b=gnkYF5c6k8FHX=_@f+}n
ziDEB}o;~@*eQ(|-GR6=?=ft@SlV0dzoaZObpPV>tTz(V!_k%az74DnwXg>!_!gZ-$
zou-fIDjsgU59d-9SE*A<m|NduTGxx#aaaMHXzH|^aWm@2(&Abb>@3-P@D5ieLegtN
zikxkf?|>Hx&Xt>j&bx>4W(#3HZ;Toq@Cgm^$oJ-woaY#^>UWLD$L4lCTfcwFQasNR
zksBXkh7v9BZ-b9-sUNE!fHmX}Ji+VOF4U(b*-O1Lth;h1YyM;8lfT}2d-i!=5*ev~
z;=Z@Lx6759IxT)lI?HP{-6vF`aN}8&QnmFD4)%-bgqDB>7J6^bKXqDiG1>-R(0A!+
zLIqH;;yuUEiQXW2FQNc=rnnpY{@$@(Wa!Z0fuj^0ADw&&t7Wc{NvU`K#P}px(B?H7
znR2v1^DK{SW%aS->M;2*+e6CX?+*;HV*il?hXl0FO<Z_QD5U)O)agl~;uOOaqx<P0
zIz&TsjK=9Ay&)|t!jEOVC+eX}W2FcX-x|SnAT$}TN9(BK6}cfRo$V{aMBYhxuR3Rm
zOqI5kr>nHDqQm)85JecVhS`5;c#Q+W#vF_LNkztcl8|v>1xep_Ntuk1{j2UzIAgDl
zS;5og`L$KSvB9P=q=xr`jN=iU`<2Er#3j6w@uVz6Y{Fhq!U!41DEK^98p}8z23@5g
zHKtA=PxaJI+i_x#KzGmHuBP4l_V#S;>NFzZW_|CTP|v;x_x9}Dv%5JGX>N{$_C&<D
zm0i0Y*tILvxpnWJu<?y8Ax~YrJ2dpoP)kb)z5Mr~v7xTk)-DX?=`B02?)*UX9`EZr
zF5dm9JS|nAc5z5VhvVV))~>GB_HcZ-{N<3izkF=xmMuF!64Acn$NTsmuJ?4?|LLXf
zdH27a`Z{kevMXNh!jwg>gvJ?uQT(|=3)+pd@Z<^w#Z-k>>8RLIp*8BGxeBdQ8(pu^
z25#-IJR0R?(d7y)aDys#a9^VIVnwb}fR0ya4f;=3XdTtpSD_88eW*g4tNx%?0=R3^
zPt-^QwO42#>_|k_Y}~W}I8TQuqTQ&937VuQ=p3D=vowlZ+6Q_ZwLMHHAvsg!9|u1M
z{$)r9FrK2*SotV!^(5Agu8|$Z%o%!#p2CV1y+OIp89E{Nh{5_9dJXgaa_tzX!;p;Q
zc^n#(;Ln3+e}?H*?D)L&>H-a7|4B&MKKrwsj$k|m={U5{BWJww0_M*_BZdff&_3Ej
z4{or_KCHDI+h99(hwW8c55w<4JpJ_W2D|I6ex1MTy}vW|ulMmF;+#MnoGtG}IObil
zZ?8~$kcWQgorA_W@)N^Z4bVYkCWhw#WaAi*R4rVP+(~4SbNLG1W6;I5MAxVlZ>}zG
zGyGCDO^!sp%%V-pxBND);iORN^nzSJ>#doFe7b6dwYc?eka=r+<s8qi@Y7Xlt<1B@
zb0qu99@CO%Da)tjc&Qb&`z^kQF_X^5@C}No^lZ#W7h-~b7$a)NeT`BJI#WSvjzuUC
ztHYd4&%_M+LCm6&m`=xHetI;<w>ym9h~9)ALT^B?r)!4*dsp4(_)*@czFxX|<r?ij
z;C8#+V*l%X^iTP`e&wDH{B}@PRZ#>tO%96U6Cm)DLhUH(Wk=EK{C>ZwX=TUBFD<13
zV~*qUXTGD5HK?p<h2nC0A@x;iA-!BI6oP)AKUgRhid~&B0#p3(-`X8u94v&Lb!ok>
zPA{g@#oP1q^Qpx}BN%K5g&L`t2`n!!msH#C+|p^*w{F?eT5p!4uHvh!+f-NQQ{1ST
zT>MYeb+TE<jcw*o6nrVY{i?B4cd{HrfPzwEal;G*ikVD4?oW_v<t)q6oLp{mLn`FA
z?fOuIm6-j)NjYE4&LpgIgXOmpGhco=lh}MuHC-GIN5E;ag`#`GG-iFJylRrBp>8=}
zPN_6y2?~Wmc0QG&OgxlbbZE}74O1uG#5h-+GUkk6G#WJS?S|_(4MgF!%E&u#s+dJ@
zPPXBT5N<<jNB3ou$>a=r+;4~H=JF5)GRb83+zns$MmG3aCY4MiKK<~+PZNn`D)U(;
z95%@ef0m(OkTS9WV06t9sg<y7RZ-1NN?GW-aEnFvZ`ZG1|JTi%)Y8(uW5;($ECu2n
zw&M>rgu@L%{}-XTd}E}3Ykj1#Fc&KS`{qn&?izko!{sS*QGFsVNpa<xwY+TGwo0XC
z(78}3w}f+F0&Q8jT+SiQ0)4~hyOF$g>sAtUD3nU2^1=>*_Ae~>n>so=nywi7R_V6h
zmP}>>ZF({pK;)WwFZTI~db_FV_L}OJne<*<-YOnN*`$_*;+6}=VyTSAKcZE`B)5$J
zBSgGI)$zYTxvZ*&W%>MmpJf?1n|!gDM`o0cc3E%UVJRBlAe<9sus!Hd!7LTXM4+~1
zmhuQ}Ic^yRos;P}?Wy@vI+Ya};T8(%LctZ8Qk`jMP)NEWr0LZ|!3BlYRkxc|=_<Pn
z*B!)Q7-n4ayl#irCAc6;C3tSyeoJ5D^rkkLU9B*_BM92ZS436Yau(&t^83(i+gV=D
zW|v4c^M*l%wz;pI%v?q+2p6%;=W+$H;568Q1!0KwX@)&%boEk%%)FwPi&WxPmT)s=
zxs<{E)BS$3;+E-CDd-fOVq7m`2x?PC(8<ovXPxE<QX;bp9|2R+S)rJh8U^qt7zo&K
zZh2`DzmQAic%&?xV##!1W!Wj}j=(ju9sQb>&zq*Hl9NXT6)dZeU0htuUb&_T{2%Ma
zh09f`WV5&h@E&v~69@!gIRo0Qt8??|beh-NHX{<LHt71<+4{z4G};Jyb{2%+P0xZ}
zYHnV-`T6Ic-vpgb!;bD2(xB~J&IWKg+LcQI{4(mne+eV_1`OaE(2sAxGx!FK;2SUq
ztUm~>9{|=L2G$<});|(cTBGodp#j-NtDqaoLWpQBkd_!7t%c7Lp1BabThFJp&ZMHW
z-3^j~$ZdCnVn*T?_HhFQ!{=Jit0sWFEj1w*h}+U!jhEe9fm)%|g4j6zLj<-qY{1qj
zzDjEfekE28p2Kdx3zU*X()PPRsE436Qn&)0s?v5h+yrd4-3>JXnrn_(o{IP4>nWl&
z(Tc$;S`(=ls3Ku`BI`j)Rl*y=iHt&cBPaor<e?&0l`ljEjM$-;S~x`Tr==DKu{(U5
z*PMn2KPZn#4demvL~4KzFo&&Ft^%K;JW4L+8aRWijsK0-0*odBW~!<24qV}jbt$wS
OR2Wkl?|>9Wl>Y)~tZsq;

literal 0
HcmV?d00001

diff --git a/tools/font-subset/gen/2.ttf b/tools/font-subset/gen/2.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..21a46926ee704c753231e60b1b3a8b823cf8bf4d
GIT binary patch
literal 1132
zcmaJ=&rj1}7=GH7F&r=lD|3^CI)s?ksjPHF<Do_rAs7NWOiYX{V{Dp@Eo>4nXh<}k
zz35-yNiQC~m~b?agNYKkn9Q5uWTM>6=JRzWSq$;(-tT?h-_Q58g9M-xoAAJ%xp6kJ
zH~uFNNbl%f$Q09Mbk=Uso~AvTS*>aaO5?=a6eX9glp76J0-q?pTw#6b%LYA=kI~-E
zXVZ%v-ftP!Z_-ZY=};tDrhSU`$$YW8Cfisd-lg~orA!)QC=l0#T}-c)aR=Xte^9jL
zbTNDUm-UGKf3nBJa;Z{nJVS!mC*m$Qi44S$AZ(=QhtpG>(}TAV%-Db;@d0zr2#0eD
zs>T!1?~uh@QPi@F>eeM}ks|IR#9i1SDA1@CKD29!xSg7((HN*ZalwM(`RbkjFmpF>
zaUUJcDW89DUtt8)*T||aLsn?|ToUXkLwb%j7Eep!1}9v-j|iR$B5i_)yN(`!1HD=E
z)Yw6+=I*j-#x)q^Z$p)~q#gJ%fFWSW8ng!0LDf`ED;!o&SYy^`Qb?jtRr~tXb~EIS
z4NECow{87#yuKN?M?(Ff5&QkkNG!5v*fxK&@o+f4Vb1yk-Jwu-z&~s51fx-LKPec}
z8|fpwID&4(I4?GAvE>+thAHMDBPH}i=A(+P>o1J@Yr~B9^!LO~BN7Zoc2cR7t{bXq
z+)qsT16{qnT><};^J?31Tf7~mgNI$fmWw6y<CTkLGI;4?59ToLVx=Xg4N>T>-%A8s
zM;cXRv4VR<1xzA?5|&XxoISG0;Q_sA#^;@^3iCu<!wA2@bKEUlbv#u^udpJ^Xu^qV
zxIp~x46S8KGb71q=P3!NWAdNL|Es^u*=4Ld{By|jEMj((mxc*OOJr0ar_+o~l6i*A
bG+d&uKt0FvH0vskmF3CBZLD%%6#ufne^049

literal 0
HcmV?d00001

diff --git a/tools/font-subset/gen/2variable.ttf b/tools/font-subset/gen/2variable.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e0552ba3e28c611313b627b0017ddfe1ddfd33e2
GIT binary patch
literal 7856
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
J!aR=X{{VSop<Vz0

literal 0
HcmV?d00001

diff --git a/tools/font-subset/gen/3.ttf b/tools/font-subset/gen/3.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..928beada2370b9c2df6ea2bac37197f962eceb66
GIT binary patch
literal 1224
zcmaJ=-Ahwp82`OzN0+W#(;e4L^61oJYn3}4N8!bZEHjGGTo+xGV=b*_4mU-kV$cT!
zT}V)Wfme0YKM-_T)I|_d1i^}~f*`2wLi;^uhgcE4?0KKx^ZoIjK>^r^3Vd)*oZOxI
zJpA((pq^1XnVZQLt7Fw+%6BOb<rc~&LW(k8lJu!;skpw*NZ=J|!&G7E{JZztRsd}W
zV|u6a*>g>e?{mZxv=2^Gp({<JyoYk{^h|kCyM*(^Z%NIC*<2RSQ6T;#@=SKIh%@*=
z{FP*0&d%hwezUIuzGKXBr8rwEuir+Bc(d5O-V}S1A|W`)AVG_qH1pmgmw9zO#uib6
zZq$g*!7fp_(~zy-ki7pm^p&8xTcYbvEuZqeNiW~|ayB^h15LGv*WX_r5=ZhQtgxm*
z(<yH75{gM2WuIZ*k~hp=xl1&XD`-`{+Rf=u^$G7<>-y+=(E+*!wTuRib4<xbM?C%m
zQQVZo4U*S8vaUZ)MKadU^*gV)ncO134;bpHT15a|=mYxfm>n}>hGkfGBw}>iX?yRW
zP^#T9+S?7k6>jY5R~aYnIPvSrwMx<%2zQ1DoF@~}p6KU<<M20@j6{-Gt+7C`B^+)E
z2F9$_P)CQn5MNF`QZG1pGg{EYdOiI%Q>IxoLbCo*QlT|^szZ;*<M$J54-;0hwX-#8
zC8D8FbTyO7#N!FWNL)-E4For}wQULpj`E3h&X!QCoJ&U&E46WhmJ!?TPe+WHFXE5c
zeg5sXr6%X+ok_>3n2s~A3<Bj;L{Sq&E1UA;w7i_&L_CS79#-hYiib7Uc;I0l#xd++
zz0Rir9f*7SMk3%ivM3{uIb0wrU=%sb;xbA|GDjX$n5Q;N`zhC}L_e{c7~prkhqsNx
zuBPnrIY#7ZO}SPR`-%UqVb)ctc?`1JK2plfIQUoP|HU6<?IM=k{--d_S)_KYFB2oQ
o&a$Hdd)i6MC_B%wGZP1>E0B+Ko?2YVmGYciwz0tbocwct0XJv7EC2ui

literal 0
HcmV?d00001

diff --git a/tools/font-subset/gen/3variable.ttf b/tools/font-subset/gen/3variable.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..214cf3997a56c057ba1ad08c56c078c90f34a289
GIT binary patch
literal 10320
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

literal 0
HcmV?d00001


From 8b78c327d1cc7a8f010b520fc76e928b77bc6302 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 16:11:05 -0800
Subject: [PATCH 13/16] Convert to int

---
 third_party/txt/tests/platform_mac_tests.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/txt/tests/platform_mac_tests.cc b/third_party/txt/tests/platform_mac_tests.cc
index 780533e9b225a..8e3ed174b55a4 100644
--- a/third_party/txt/tests/platform_mac_tests.cc
+++ b/third_party/txt/tests/platform_mac_tests.cc
@@ -28,7 +28,7 @@ TEST_F(PlatformMacTests, RegisterSystemFonts) {
   ASSERT_EQ(dynamic_font_manager.font_provider()
                 .MatchFamily("CupertinoSystemDisplay")
                 ->count(),
-            9ul);
+            9);
 }
 
 }  // namespace testing

From a3f3346d2ee8584a4c12b5c3f23dbe6e70a45bda Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Wed, 3 Jan 2024 16:17:51 -0800
Subject: [PATCH 14/16] Revert "Convert to int"

This reverts commit 47caba541bc24431e84ae9a31a39cb67e9bf437f.
---
 tools/font-subset/gen/1.ttf         | Bin 1024 -> 0 bytes
 tools/font-subset/gen/1variable.ttf | Bin 5172 -> 0 bytes
 tools/font-subset/gen/2.ttf         | Bin 1132 -> 0 bytes
 tools/font-subset/gen/2variable.ttf | Bin 7856 -> 0 bytes
 tools/font-subset/gen/3.ttf         | Bin 1224 -> 0 bytes
 tools/font-subset/gen/3variable.ttf | Bin 10320 -> 0 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tools/font-subset/gen/1.ttf
 delete mode 100644 tools/font-subset/gen/1variable.ttf
 delete mode 100644 tools/font-subset/gen/2.ttf
 delete mode 100644 tools/font-subset/gen/2variable.ttf
 delete mode 100644 tools/font-subset/gen/3.ttf
 delete mode 100644 tools/font-subset/gen/3variable.ttf

diff --git a/tools/font-subset/gen/1.ttf b/tools/font-subset/gen/1.ttf
deleted file mode 100644
index afeb7c4051d87864742ebdb6a3988b9137b06741..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmaJ<O=}Zj5Po*EjfrhdlV(%X7F_EGvTOX<bW;?Oimm;iB2=~o5$v+vCYGcLO)RY_
z1Qd_rMSp=O1@R(y^llG=h+c$v6R+BvHa_p}9zqdknR%a?d1vOCmxTnN2TepUe(m~c
z^T*`x5+J>0bjhtaHT1L=>Ce$0bvGIslF|h6HdQG)^;)~lN}xrJ70X*IeHRz+0rElm
zt0m7_jz_<`tZ&jUlo(JXS*Cx2{?SsUu_@a~5`UmZ%T?EbMFe~ie#P0W;U>Njf2V3|
zPQ@GgY29c4hwO2;R;@SMk6;qVL|$-X^CWC~LV{irIm!@w%6JXIOduBdv2mR8BVr3m
z`+?~94`ID1>ae0?rvww=zek!@_-QE6cq;tpw-j>m?V&$@Ua+7>K0kgn^yXIL!VcoW
zl#jo*Cz%1yX|mdtAuDuaAqjTmN>9+m;yG!BnW^yHK^A-+8C~H<qD!AJoziS6Ep`wR
z*pN+dM}tAWHVo;d^d3>{#{rB0$3~7@`E+#5I-(9x^8@N(Ys?xg2sJaRn#rgVQrU$;
zMc4JG#_kIvpGys=a(N@0OlCjXwyo=isv4{2Y<Hr!zrQ!pJsUpuKHLy5ro>5L3GYHI
zVHnRtER(~t5JxbNi4ZFtce*eLJ&Z?*fU9uOfQNP5CMshFE~;2V9Xa;!P{bWZ9p)GO
zTXo(Oc@1azU!0+}aK(=_{BxZZ9<!#O)o`A8?+mSDN^qmVY3Hb>-?6Y~^8e~Db9N0|
zKK~+0+(pa|cxjkown|22ayrS(44J!Rrr{D}WuEigC#b9Yp2y9_Yi!Uii$DJ_Luipt

diff --git a/tools/font-subset/gen/1variable.ttf b/tools/font-subset/gen/1variable.ttf
deleted file mode 100644
index 0efa2a0315b0ebb6a3207abedf06f9b72d7deee6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5172
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
OR2Wkl?|>9Wl>Y)~tZsq;

diff --git a/tools/font-subset/gen/2.ttf b/tools/font-subset/gen/2.ttf
deleted file mode 100644
index 21a46926ee704c753231e60b1b3a8b823cf8bf4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1132
zcmaJ=&rj1}7=GH7F&r=lD|3^CI)s?ksjPHF<Do_rAs7NWOiYX{V{Dp@Eo>4nXh<}k
zz35-yNiQC~m~b?agNYKkn9Q5uWTM>6=JRzWSq$;(-tT?h-_Q58g9M-xoAAJ%xp6kJ
zH~uFNNbl%f$Q09Mbk=Uso~AvTS*>aaO5?=a6eX9glp76J0-q?pTw#6b%LYA=kI~-E
zXVZ%v-ftP!Z_-ZY=};tDrhSU`$$YW8Cfisd-lg~orA!)QC=l0#T}-c)aR=Xte^9jL
zbTNDUm-UGKf3nBJa;Z{nJVS!mC*m$Qi44S$AZ(=QhtpG>(}TAV%-Db;@d0zr2#0eD
zs>T!1?~uh@QPi@F>eeM}ks|IR#9i1SDA1@CKD29!xSg7((HN*ZalwM(`RbkjFmpF>
zaUUJcDW89DUtt8)*T||aLsn?|ToUXkLwb%j7Eep!1}9v-j|iR$B5i_)yN(`!1HD=E
z)Yw6+=I*j-#x)q^Z$p)~q#gJ%fFWSW8ng!0LDf`ED;!o&SYy^`Qb?jtRr~tXb~EIS
z4NECow{87#yuKN?M?(Ff5&QkkNG!5v*fxK&@o+f4Vb1yk-Jwu-z&~s51fx-LKPec}
z8|fpwID&4(I4?GAvE>+thAHMDBPH}i=A(+P>o1J@Yr~B9^!LO~BN7Zoc2cR7t{bXq
z+)qsT16{qnT><};^J?31Tf7~mgNI$fmWw6y<CTkLGI;4?59ToLVx=Xg4N>T>-%A8s
zM;cXRv4VR<1xzA?5|&XxoISG0;Q_sA#^;@^3iCu<!wA2@bKEUlbv#u^udpJ^Xu^qV
zxIp~x46S8KGb71q=P3!NWAdNL|Es^u*=4Ld{By|jEMj((mxc*OOJr0ar_+o~l6i*A
bG+d&uKt0FvH0vskmF3CBZLD%%6#ufne^049

diff --git a/tools/font-subset/gen/2variable.ttf b/tools/font-subset/gen/2variable.ttf
deleted file mode 100644
index e0552ba3e28c611313b627b0017ddfe1ddfd33e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7856
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
J!aR=X{{VSop<Vz0

diff --git a/tools/font-subset/gen/3.ttf b/tools/font-subset/gen/3.ttf
deleted file mode 100644
index 928beada2370b9c2df6ea2bac37197f962eceb66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1224
zcmaJ=-Ahwp82`OzN0+W#(;e4L^61oJYn3}4N8!bZEHjGGTo+xGV=b*_4mU-kV$cT!
zT}V)Wfme0YKM-_T)I|_d1i^}~f*`2wLi;^uhgcE4?0KKx^ZoIjK>^r^3Vd)*oZOxI
zJpA((pq^1XnVZQLt7Fw+%6BOb<rc~&LW(k8lJu!;skpw*NZ=J|!&G7E{JZztRsd}W
zV|u6a*>g>e?{mZxv=2^Gp({<JyoYk{^h|kCyM*(^Z%NIC*<2RSQ6T;#@=SKIh%@*=
z{FP*0&d%hwezUIuzGKXBr8rwEuir+Bc(d5O-V}S1A|W`)AVG_qH1pmgmw9zO#uib6
zZq$g*!7fp_(~zy-ki7pm^p&8xTcYbvEuZqeNiW~|ayB^h15LGv*WX_r5=ZhQtgxm*
z(<yH75{gM2WuIZ*k~hp=xl1&XD`-`{+Rf=u^$G7<>-y+=(E+*!wTuRib4<xbM?C%m
zQQVZo4U*S8vaUZ)MKadU^*gV)ncO134;bpHT15a|=mYxfm>n}>hGkfGBw}>iX?yRW
zP^#T9+S?7k6>jY5R~aYnIPvSrwMx<%2zQ1DoF@~}p6KU<<M20@j6{-Gt+7C`B^+)E
z2F9$_P)CQn5MNF`QZG1pGg{EYdOiI%Q>IxoLbCo*QlT|^szZ;*<M$J54-;0hwX-#8
zC8D8FbTyO7#N!FWNL)-E4For}wQULpj`E3h&X!QCoJ&U&E46WhmJ!?TPe+WHFXE5c
zeg5sXr6%X+ok_>3n2s~A3<Bj;L{Sq&E1UA;w7i_&L_CS79#-hYiib7Uc;I0l#xd++
zz0Rir9f*7SMk3%ivM3{uIb0wrU=%sb;xbA|GDjX$n5Q;N`zhC}L_e{c7~prkhqsNx
zuBPnrIY#7ZO}SPR`-%UqVb)ctc?`1JK2plfIQUoP|HU6<?IM=k{--d_S)_KYFB2oQ
o&a$Hdd)i6MC_B%wGZP1>E0B+Ko?2YVmGYciwz0tbocwct0XJv7EC2ui

diff --git a/tools/font-subset/gen/3variable.ttf b/tools/font-subset/gen/3variable.ttf
deleted file mode 100644
index 214cf3997a56c057ba1ad08c56c078c90f34a289..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10320
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


From a528a5785e407c6327216494c9c16184c449fbcd Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Thu, 4 Jan 2024 09:19:31 -0800
Subject: [PATCH 15/16] Update test, move logic to lambda

---
 third_party/txt/src/txt/platform_mac.mm     | 32 ++++++++-------------
 third_party/txt/tests/platform_mac_tests.cc |  2 +-
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index 3a0e3f0010dc2..bfe59f429929d 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -83,11 +83,10 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   // than 17. The "familyName" property returned from CoreText stays the same
   // despite the typeface is different.
   //
-  // Below code manually loads and registers the larger font. The existing
-  // fallback correctly loads the smaller font. The code also iterates through
-  // the possible font weights from 100 - 900 to correctly load all of them, as
-  // a CTFont object for the large system font does not include all of the font
-  // weights by default.
+  // Below code manually loads and registers the larger font. The existing fallback
+  // correctly loads the smaller font. The code also iterates through the possible
+  // font weights from 100 - 900 to correctly load all of them, as a CTFont object
+  // for the large system font does not include all of the font weights by default.
   //
   // Darwin system fonts from 17 to 28 also have dynamic spacing based on sizes.
   // These two fonts do not match the spacings when sizes are from 17 to 28.
@@ -95,30 +94,23 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   //
   // See https://www.wwdcnotes.com/notes/wwdc20/10175/ for Apple's document on
   // this topic.
-  for (int i = 0; i < 8; i++) {
-    const int font_weight = i * 100;
+  auto register_weighted_font = [&dynamic_font_manager](const int weight) {
     sk_sp<SkTypeface> large_system_font_weighted =
         SkMakeTypefaceFromCTFont((CTFontRef)CFAutorelease(
-            MatchSystemUIFont(font_weight, kSFProDisplayBreakPoint)));
+            MatchSystemUIFont(weight, kSFProDisplayBreakPoint)));
     if (large_system_font_weighted) {
       dynamic_font_manager.font_provider().RegisterTypeface(
           large_system_font_weighted, kSFProDisplayName);
     }
+  };
+  for (int i = 0; i < 8; i++) {
+    const int font_weight = i * 100;
+    register_weighted_font(font_weight);
   }
   // The value 780 returns a font weight of 800.
-  sk_sp<SkTypeface> large_system_font_weighted_800 = SkMakeTypefaceFromCTFont((
-      CTFontRef)CFAutorelease(MatchSystemUIFont(780, kSFProDisplayBreakPoint)));
-  if (large_system_font_weighted_800) {
-    dynamic_font_manager.font_provider().RegisterTypeface(
-        large_system_font_weighted_800, kSFProDisplayName);
-  }
+  register_weighted_font(780);
   // The value of 810 returns a font weight of 900.
-  sk_sp<SkTypeface> large_system_font_weighted_900 = SkMakeTypefaceFromCTFont((
-      CTFontRef)CFAutorelease(MatchSystemUIFont(810, kSFProDisplayBreakPoint)));
-  if (large_system_font_weighted_900) {
-    dynamic_font_manager.font_provider().RegisterTypeface(
-        large_system_font_weighted_900, kSFProDisplayName);
-  }
+  register_weighted_font(810);
 }
 
 }  // namespace txt
diff --git a/third_party/txt/tests/platform_mac_tests.cc b/third_party/txt/tests/platform_mac_tests.cc
index 8e3ed174b55a4..5ede81394ecdc 100644
--- a/third_party/txt/tests/platform_mac_tests.cc
+++ b/third_party/txt/tests/platform_mac_tests.cc
@@ -28,7 +28,7 @@ TEST_F(PlatformMacTests, RegisterSystemFonts) {
   ASSERT_EQ(dynamic_font_manager.font_provider()
                 .MatchFamily("CupertinoSystemDisplay")
                 ->count(),
-            9);
+            10);
 }
 
 }  // namespace testing

From 0b6fc08b989614938b2bd4ec061240b7897be1a4 Mon Sep 17 00:00:00 2001
From: Mitchell Goodwin <mitchgoodwin@google.com>
Date: Thu, 4 Jan 2024 09:24:17 -0800
Subject: [PATCH 16/16] Formatting

---
 third_party/txt/src/txt/platform_mac.mm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index bfe59f429929d..6cec1dcf68838 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -83,10 +83,11 @@ void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
   // than 17. The "familyName" property returned from CoreText stays the same
   // despite the typeface is different.
   //
-  // Below code manually loads and registers the larger font. The existing fallback
-  // correctly loads the smaller font. The code also iterates through the possible
-  // font weights from 100 - 900 to correctly load all of them, as a CTFont object
-  // for the large system font does not include all of the font weights by default.
+  // Below code manually loads and registers the larger font. The existing
+  // fallback correctly loads the smaller font. The code also iterates through
+  // the possible font weights from 100 - 900 to correctly load all of them, as
+  // a CTFont object for the large system font does not include all of the font
+  // weights by default.
   //
   // Darwin system fonts from 17 to 28 also have dynamic spacing based on sizes.
   // These two fonts do not match the spacings when sizes are from 17 to 28.