From 0a59a2230933cf23e6e9389c5b62b40558e3fa60 Mon Sep 17 00:00:00 2001
From: lindexi <lindexi@users.noreply.github.com>
Date: Fri, 24 May 2024 17:47:05 +0800
Subject: [PATCH] Propagate Dispose from GlyphTypefaceImpl to dispose
 SkTypeface (#15733)

---
 src/Skia/Avalonia.Skia/FontManagerImpl.cs   | 2 +-
 src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Skia/Avalonia.Skia/FontManagerImpl.cs b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
index 07caa09d52..3cbfc791e1 100644
--- a/src/Skia/Avalonia.Skia/FontManagerImpl.cs
+++ b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
@@ -59,7 +59,7 @@ namespace Avalonia.Skia
             t_languageTagBuffer[0] = culture.TwoLetterISOLanguageName;
             t_languageTagBuffer[1] = culture.ThreeLetterISOLanguageName;
 
-            var skTypeface = _skFontManager.MatchCharacter(null, skFontStyle, t_languageTagBuffer, codepoint);
+            using var skTypeface = _skFontManager.MatchCharacter(null, skFontStyle, t_languageTagBuffer, codepoint);
 
             if (skTypeface != null)
             {
diff --git a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
index f6bbd72244..f734bfa3a6 100644
--- a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
@@ -188,6 +188,7 @@ namespace Avalonia.Skia
 
             Font.Dispose();
             Face.Dispose();
+            _typeface.Dispose();
         }
 
         public void Dispose()