From 8a322d616f2ca1f9f4de4d1afce00146a3d97c75 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Mon, 13 Feb 2023 23:05:19 -0500 Subject: [PATCH] Cleanup Skia internal APIs --- src/Skia/Avalonia.Skia/GlyphRunImpl.cs | 5 +---- src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs | 4 +--- .../Avalonia.Skia/SKTypefaceCollection.cs | 2 +- .../SKTypefaceCollectionCache.cs | 2 +- src/Skia/Avalonia.Skia/readme.md | 22 ------------------- 5 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 src/Skia/Avalonia.Skia/readme.md diff --git a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs index cc669f9aaa..cfd6fc12f8 100644 --- a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs +++ b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs @@ -1,15 +1,12 @@ using System; using System.Collections.Generic; -using Avalonia.Metadata; using Avalonia.Platform; using SkiaSharp; #nullable enable namespace Avalonia.Skia { - /// - [Unstable] - public class GlyphRunImpl : IGlyphRunImpl + internal class GlyphRunImpl : IGlyphRunImpl { public GlyphRunImpl(SKTextBlob textBlob, Size size, Point baselineOrigin) { diff --git a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs index 71bdc1bd6b..a8dd289a13 100644 --- a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs +++ b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs @@ -1,14 +1,12 @@ using System; using System.Runtime.InteropServices; using Avalonia.Media; -using Avalonia.Metadata; using HarfBuzzSharp; using SkiaSharp; namespace Avalonia.Skia { - [Unstable] - public class GlyphTypefaceImpl : IGlyphTypeface + internal class GlyphTypefaceImpl : IGlyphTypeface { private bool _isDisposed; diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs index 1f3f20730f..73f58e66bc 100644 --- a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs +++ b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs @@ -4,7 +4,7 @@ using SkiaSharp; namespace Avalonia.Skia { - public class SKTypefaceCollection + internal class SKTypefaceCollection { private readonly ConcurrentDictionary _typefaces = new ConcurrentDictionary(); diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs index f7a86c11ff..b49efd59cd 100644 --- a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs +++ b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs @@ -7,7 +7,7 @@ using SkiaSharp; namespace Avalonia.Skia { - public static class SKTypefaceCollectionCache + internal static class SKTypefaceCollectionCache { private static readonly ConcurrentDictionary s_cachedCollections; diff --git a/src/Skia/Avalonia.Skia/readme.md b/src/Skia/Avalonia.Skia/readme.md deleted file mode 100644 index 7ed92c5453..0000000000 --- a/src/Skia/Avalonia.Skia/readme.md +++ /dev/null @@ -1,22 +0,0 @@ -DrawingContextImpl -- Alpha support missing as SkiaSharp does not expose this -- Gradient Shader caching? -- Pen Dash styles - -Formatted Text Rendering -- Minor polish - -Linux -- Need gpu platform implementation - -macOS -- Need gpu platform implementation - -Android -- Not tested at all yet - -iOS -- Not tested at all yet - -General -- Get Skia Unit Tests passing (most of the issues are related to antialiasing) \ No newline at end of file