From 2e2914f625bd7aab6a01ccf9946748d21dc80d7f Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sun, 17 Nov 2019 05:45:08 +0200
Subject: [PATCH] Final tweaks to prepare for release (#1013)

* PRs should use a custom prerelease label
* Update some docs
* Release the mouse when the button is released
  We must not require that the Handled == true because in many
  cases it is not an action that is really handled. Especially if the
  mouse is captured - nobody else is receiving events.
---
 binding/Binding/SKShader.cs                   | 14 +++++++
 .../HarfBuzzSharp/2.6.1/HarfBuzzSharp.md      |  8 ++++
 .../1.68.1/SkiaSharp.Views.Android.md         | 13 ++++++-
 changelogs/SkiaSharp/1.68.1/SkiaSharp.md      | 39 ++++++++++++++++++-
 docs                                          |  2 +-
 externals/skia                                |  2 +-
 scripts/azure-templates-bootstrapper.yml      |  4 ++
 .../SKTouchHandlerElement.cs                  |  7 +---
 .../SKTouchHandlerWinForms.cs                 |  7 +---
 9 files changed, 82 insertions(+), 14 deletions(-)

diff --git a/binding/Binding/SKShader.cs b/binding/Binding/SKShader.cs
index 29b3288f..aaaf3aa8 100644
--- a/binding/Binding/SKShader.cs
+++ b/binding/Binding/SKShader.cs
@@ -37,6 +37,20 @@ namespace SkiaSharp
 			return GetObject<SKShader> (SkiaApi.sk_shader_new_bitmap (src.Handle, tmx, tmy, &localMatrix));
 		}
 
+		public static SKShader CreatePicture (SKPicture src, SKShaderTileMode tmx, SKShaderTileMode tmy)
+		{
+			if (src == null)
+				throw new ArgumentNullException (nameof (src));
+			return GetObject<SKShader> (SkiaApi.sk_shader_new_picture (src.Handle, tmx, tmy, null, null));
+		}
+
+		public static SKShader CreatePicture (SKPicture src, SKShaderTileMode tmx, SKShaderTileMode tmy, SKRect tile)
+		{
+			if (src == null)
+				throw new ArgumentNullException (nameof (src));
+			return GetObject<SKShader> (SkiaApi.sk_shader_new_picture (src.Handle, tmx, tmy, null, &tile));
+		}
+
 		public static SKShader CreatePicture (SKPicture src, SKShaderTileMode tmx, SKShaderTileMode tmy, SKMatrix localMatrix, SKRect tile)
 		{
 			if (src == null)
diff --git a/changelogs/HarfBuzzSharp/2.6.1/HarfBuzzSharp.md b/changelogs/HarfBuzzSharp/2.6.1/HarfBuzzSharp.md
index a0772fe3..0495d8e4 100644
--- a/changelogs/HarfBuzzSharp/2.6.1/HarfBuzzSharp.md
+++ b/changelogs/HarfBuzzSharp/2.6.1/HarfBuzzSharp.md
@@ -71,6 +71,7 @@ public UnicodeFunctions UnicodeFunctions { get; set; }
 Added methods:
 
 ```csharp
+public void Add (int codepoint, int cluster);
 public void Add (uint codepoint, uint cluster);
 public void AddCodepoints (System.ReadOnlySpan<int> text);
 public void AddCodepoints (System.ReadOnlySpan<uint> text);
@@ -828,6 +829,7 @@ public struct Script, System.IEquatable<Script> {
 	public override int GetHashCode ();
 	public static Script Parse (string str);
 	public override string ToString ();
+	public static bool TryParse (string str, out Script script);
 	public static uint op_Implicit (Script script);
 	public static Script op_Implicit (uint tag);
 }
@@ -973,9 +975,13 @@ public class UnicodeFunctions : HarfBuzzSharp.NativeObject, System.IDisposable {
 	// methods
 	protected override void Dispose (bool disposing);
 	protected override void DisposeHandler ();
+	public UnicodeCombiningClass GetCombiningClass (int unicode);
 	public UnicodeCombiningClass GetCombiningClass (uint unicode);
+	public UnicodeGeneralCategory GetGeneralCategory (int unicode);
 	public UnicodeGeneralCategory GetGeneralCategory (uint unicode);
+	public int GetMirroring (int unicode);
 	public uint GetMirroring (uint unicode);
+	public Script GetScript (int unicode);
 	public Script GetScript (uint unicode);
 	public void MakeImmutable ();
 	public void SetCombiningClassDelegate (CombiningClassDelegate del, ReleaseDelegate destroy);
@@ -984,7 +990,9 @@ public class UnicodeFunctions : HarfBuzzSharp.NativeObject, System.IDisposable {
 	public void SetGeneralCategoryDelegate (GeneralCategoryDelegate del, ReleaseDelegate destroy);
 	public void SetMirroringDelegate (MirroringDelegate del, ReleaseDelegate destroy);
 	public void SetScriptDelegate (ScriptDelegate del, ReleaseDelegate destroy);
+	public bool TryCompose (int a, int b, out int ab);
 	public bool TryCompose (uint a, uint b, out uint ab);
+	public bool TryDecompose (int ab, out int a, out int b);
 	public bool TryDecompose (uint ab, out uint a, out uint b);
 }
 ```
diff --git a/changelogs/SkiaSharp.Views/1.68.1/SkiaSharp.Views.Android.md b/changelogs/SkiaSharp.Views/1.68.1/SkiaSharp.Views.Android.md
index 990bcac7..f654c04a 100644
--- a/changelogs/SkiaSharp.Views/1.68.1/SkiaSharp.Views.Android.md
+++ b/changelogs/SkiaSharp.Views/1.68.1/SkiaSharp.Views.Android.md
@@ -2,4 +2,15 @@
 
 ## SkiaSharp.Views.Android.dll
 
-> No changes.
+### Namespace SkiaSharp.Views.Android
+
+#### Type Changed: SkiaSharp.Views.Android.SKCanvasView
+
+Added method:
+
+```csharp
+protected override void OnDetachedFromWindow ();
+```
+
+
+
diff --git a/changelogs/SkiaSharp/1.68.1/SkiaSharp.md b/changelogs/SkiaSharp/1.68.1/SkiaSharp.md
index 0b1081cb..6a23b50f 100644
--- a/changelogs/SkiaSharp/1.68.1/SkiaSharp.md
+++ b/changelogs/SkiaSharp/1.68.1/SkiaSharp.md
@@ -66,6 +66,7 @@ public System.ReadOnlySpan<byte> GetPixelSpan ();
 Added methods:
 
 ```csharp
+public void Discard ();
 protected override void DisposeNative ();
 public void DrawDrawable (SKDrawable drawable, ref SKMatrix matrix);
 public void DrawDrawable (SKDrawable drawable, SKPoint p);
@@ -183,6 +184,15 @@ protected override void DisposeNative ();
 ```
 
 
+#### Type Changed: SkiaSharp.SKEncodedImageFormat
+
+Added value:
+
+```csharp
+Heif = 11,
+```
+
+
 #### Type Changed: SkiaSharp.SKFileStream
 
 Added method:
@@ -224,6 +234,7 @@ protected override void DisposeManaged ();
 Added methods:
 
 ```csharp
+public SKImage ApplyImageFilter (SKImageFilter filter, SKRectI subset, SKRectI clipBounds, out SKRectI outSubset, out SKPointI outOffset);
 public static SKImage FromEncodedData (System.ReadOnlySpan<byte> data);
 public static SKImage FromPixelCopy (SKImageInfo info, System.ReadOnlySpan<byte> pixels);
 public static SKImage FromPixelCopy (SKImageInfo info, System.ReadOnlySpan<byte> pixels, int rowBytes);
@@ -457,10 +468,36 @@ public bool Op (SKPath path, SKRegionOperation op);
 
 #### Type Changed: SkiaSharp.SKRoundRect
 
-Added method:
+Added methods:
 
 ```csharp
 protected override void DisposeNative ();
+public bool TryTransform (SKMatrix matrix, out SKRoundRect transformed);
+```
+
+
+#### Type Changed: SkiaSharp.SKShader
+
+Added methods:
+
+```csharp
+public static SKShader CreateLinearGradient (SKPoint start, SKPoint end, SKColor[] colors, SKShaderTileMode mode);
+public static SKShader CreatePicture (SKPicture src, SKShaderTileMode tmx, SKShaderTileMode tmy);
+public static SKShader CreatePicture (SKPicture src, SKShaderTileMode tmx, SKShaderTileMode tmy, SKRect tile);
+public static SKShader CreatePicture (SKPicture src, SKShaderTileMode tmx, SKShaderTileMode tmy, SKMatrix localMatrix, SKRect tile);
+public static SKShader CreateRadialGradient (SKPoint center, float radius, SKColor[] colors, SKShaderTileMode mode);
+public static SKShader CreateSweepGradient (SKPoint center, SKColor[] colors);
+public static SKShader CreateSweepGradient (SKPoint center, SKColor[] colors, SKShaderTileMode tileMode, float startAngle, float endAngle);
+public static SKShader CreateTwoPointConicalGradient (SKPoint start, float startRadius, SKPoint end, float endRadius, SKColor[] colors, SKShaderTileMode mode);
+```
+
+
+#### Type Changed: SkiaSharp.SKStream
+
+Added method:
+
+```csharp
+public bool Move (int offset);
 ```
 
 
diff --git a/docs b/docs
index 264694bd..f32810f7 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 264694bd78ecf745ea1a41c15038403e996ea2de
+Subproject commit f32810f7487a7b6ff885f88879434af298e19a44
diff --git a/externals/skia b/externals/skia
index 6c864a6c..c7bc33ce 160000
--- a/externals/skia
+++ b/externals/skia
@@ -1 +1 @@
-Subproject commit 6c864a6c858f77d7e20b37cd468103ae8d7e054b
+Subproject commit c7bc33cec7df10707f9c13254e4a593ce18aa7ae
diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml
index 1c0b1d26..a4145a5a 100644
--- a/scripts/azure-templates-bootstrapper.yml
+++ b/scripts/azure-templates-bootstrapper.yml
@@ -44,6 +44,10 @@ jobs:
             Write-Host "##vso[task.setvariable variable=FEATURE_NAME]$feature"
           }
         displayName: Determine the feature name, if any
+      - pwsh: |
+          Write-Host "##vso[task.setvariable variable=PREVIEW_LABEL]pr"
+        displayName: Use a special preview label for PRs
+        condition: eq(variables['Build.Reason'], 'PullRequest')
       # install any packages on linux
       - ${{ if endsWith(parameters.name, '_linux') }}:
         - bash: |
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKTouchHandlerElement.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKTouchHandlerElement.cs
index e67cb792..e441be1e 100644
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKTouchHandlerElement.cs
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKTouchHandlerElement.cs
@@ -83,11 +83,8 @@ namespace SkiaSharp.Views.Forms
 		{
 			e.Handled = CommonHandler(sender, SKTouchAction.Released, e);
 
-			if (e.Handled)
-			{
-				var view = sender as FrameworkElement;
-				view.ReleaseMouseCapture();
-			}
+			var view = sender as FrameworkElement;
+			view.ReleaseMouseCapture();
 		}
 
 		// processing
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKTouchHandlerWinForms.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKTouchHandlerWinForms.cs
index b254f257..520c89db 100644
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKTouchHandlerWinForms.cs
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKTouchHandlerWinForms.cs
@@ -83,11 +83,8 @@ namespace SkiaSharp.Views.Forms
 		{
 			var handled = CommonHandler(sender, SKTouchAction.Released, e);
 
-			if (handled)
-			{
-				var view = sender as Control;
-				view.Capture = false;
-			}
+			var view = sender as Control;
+			view.Capture = false;
 		}
 
 		// processing