Propagate Dispose from GlyphTypefaceImpl to dispose SkTypeface (#15733)

lindexi · web-flow · commit 0a59a2230933 · 2024-05-24T09:47:05.000Z
diff --git a/src/Skia/Avalonia.Skia/FontManagerImpl.cs b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
@@ -59,7 +59,7 @@ public bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
             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
@@ -188,6 +188,7 @@ private void Dispose(bool disposing)
 
             Font.Dispose();
             Face.Dispose();
+            _typeface.Dispose();
         }
 
         public void Dispose()

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public bool TryMatchCharacter(int codepoint, FontStyle fontStyle,`
`59`	`59`	`t_languageTagBuffer[0] = culture.TwoLetterISOLanguageName;`
`60`	`60`	`t_languageTagBuffer[1] = culture.ThreeLetterISOLanguageName;`
`61`	`61`
`62`		`- var skTypeface = _skFontManager.MatchCharacter(null, skFontStyle, t_languageTagBuffer, codepoint);`
	`62`	`+ using var skTypeface = _skFontManager.MatchCharacter(null, skFontStyle, t_languageTagBuffer, codepoint);`
`63`	`63`
`64`	`64`	`if (skTypeface != null)`
`65`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@ private void Dispose(bool disposing)`
`188`	`188`
`189`	`189`	`Font.Dispose();`
`190`	`190`	`Face.Dispose();`
	`191`	`+ _typeface.Dispose();`
`191`	`192`	`}`
`192`	`193`
`193`	`194`	`public void Dispose()`