From a0f3767c9698416fec904a04efeef8f71117f67e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 15 Apr 2024 12:28:32 +0200 Subject: [PATCH] Update skia to m116 (#2829) --- README.md | 6 +++--- binding/SkiaSharp/SKImageFilter.cs | 20 -------------------- externals/skia | 2 +- scripts/VERSIONS.txt | 6 +++--- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 81a4dc0f4f..e20162e2ec 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,6 @@ However, these are easy to install as they are found on the various websites. If Here are some links to show the differences in our code as compared to Google's code. -What version are we on? [**m115**](https://github.com/google/skia/tree/chrome/m115) -Are we up-to-date with Google? [Compare](https://github.com/mono/skia/compare/skiasharp...google:chrome/m115) -What have we added? [Compare](https://github.com/google/skia/compare/chrome/m115...mono:skiasharp) +What version are we on? [**m116**](https://github.com/google/skia/tree/chrome/m116) +Are we up-to-date with Google? [Compare](https://github.com/mono/skia/compare/skiasharp...google:chrome/m116) +What have we added? [Compare](https://github.com/google/skia/compare/chrome/m116...mono:skiasharp) diff --git a/binding/SkiaSharp/SKImageFilter.cs b/binding/SkiaSharp/SKImageFilter.cs index bcc384a1b4..a1fceca6c8 100644 --- a/binding/SkiaSharp/SKImageFilter.cs +++ b/binding/SkiaSharp/SKImageFilter.cs @@ -34,26 +34,6 @@ public static SKImageFilter CreateMatrix (in SKMatrix matrix, SKSamplingOptions return GetObject (SkiaApi.sk_imagefilter_new_matrix_transform (m, &sampling, input?.Handle ?? IntPtr.Zero)); } - - // CreateAlphaThreshold - - [Obsolete("Use CreateAlphaThreshold(SKRegion, float, float, SKImageFilter) instead.", true)] - public static SKImageFilter CreateAlphaThreshold(SKRectI region, float innerThreshold, float outerThreshold, SKImageFilter? input) - { - var reg = new SKRegion (); - reg.SetRect (region); - return CreateAlphaThreshold (reg, innerThreshold, outerThreshold, input); - } - - public static SKImageFilter CreateAlphaThreshold (SKRegion region, float innerThreshold, float outerThreshold) => - CreateAlphaThreshold (region, innerThreshold, outerThreshold, null); - - public static SKImageFilter CreateAlphaThreshold (SKRegion region, float innerThreshold, float outerThreshold, SKImageFilter? input) - { - _ = region ?? throw new ArgumentNullException (nameof (region)); - return GetObject (SkiaApi.sk_imagefilter_new_alpha_threshold (region.Handle, innerThreshold, outerThreshold, input?.Handle ?? IntPtr.Zero)); - } - // CreateBlur public static SKImageFilter CreateBlur (float sigmaX, float sigmaY) => diff --git a/externals/skia b/externals/skia index a0008792c8..8684edb4e6 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit a0008792c861228872a0a21f5f3422c4c8824720 +Subproject commit 8684edb4e68d2bbf0d56a600633f5d4c44a16a36 diff --git a/scripts/VERSIONS.txt b/scripts/VERSIONS.txt index fa0d56e5f1..536f5bafc3 100644 --- a/scripts/VERSIONS.txt +++ b/scripts/VERSIONS.txt @@ -1,7 +1,7 @@ # dependencies mdoc release 5.8.9 harfbuzz release 8.3.0 -skia release m115 +skia release m116 xunit release 2.4.2 xunit.runner.console release 2.4.2 OpenTK release 3.1.0 @@ -23,12 +23,12 @@ ANGLE release chromium/6275 # this is related to the API versions, not the library versions # - milestone: the skia milestone determined by Google/Chromium # - increment: the C API version increment caused by new APIs (externals\skia\include\c\sk_types.h) -libSkiaSharp milestone 115 +libSkiaSharp milestone 116 libSkiaSharp increment 0 # native sonames # ..0 -libSkiaSharp soname 115.0.0 +libSkiaSharp soname 116.0.0 # 0.<60000 + major*100 + minor*10 + micro>.0 HarfBuzz soname 0.60830.0