From 6169f7d9f74849dadc2dafb25de19779a0964577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Mon, 1 Aug 2016 18:58:45 +0200
Subject: [PATCH 1/4] Updated SkiaSharp to version 1.53.0

---
 nuget/template/Avalonia.Skia.Desktop.nuspec               | 2 +-
 .../Avalonia.Skia.Android/Avalonia.Skia.Android.csproj    | 4 ++--
 src/Skia/Avalonia.Skia.Android/packages.config            | 2 +-
 .../Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj    | 8 ++++----
 src/Skia/Avalonia.Skia.Desktop/packages.config            | 2 +-
 src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj       | 4 ++--
 src/Skia/Avalonia.Skia.iOS/packages.config                | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nuget/template/Avalonia.Skia.Desktop.nuspec b/nuget/template/Avalonia.Skia.Desktop.nuspec
index 7a722e0ae8..928b6d3e24 100644
--- a/nuget/template/Avalonia.Skia.Desktop.nuspec
+++ b/nuget/template/Avalonia.Skia.Desktop.nuspec
@@ -13,7 +13,7 @@
     <copyright>Copyright 2015</copyright>
     <tags>Avalonia</tags>
     <dependencies>
-      <dependency id="SkiaSharp" version="1.49.4.0-beta"/>
+      <dependency id="SkiaSharp" version="1.53.0"/>
       <dependency id="Avalonia" version="#VERSION#" />
     </dependencies>
   </metadata>
diff --git a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
index 1cb632b31a..a40ee92fbf 100644
--- a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
+++ b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
@@ -39,8 +39,8 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
-    <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SkiaSharp.1.49.4-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.53.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SkiaSharp.1.53.0\lib\MonoAndroid\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/Skia/Avalonia.Skia.Android/packages.config b/src/Skia/Avalonia.Skia.Android/packages.config
index 93b6bf1828..5f27ea1039 100644
--- a/src/Skia/Avalonia.Skia.Android/packages.config
+++ b/src/Skia/Avalonia.Skia.Android/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.49.4-beta" targetFramework="monoandroid44" />
+  <package id="SkiaSharp" version="1.53.0" targetFramework="monoandroid44" />
 </packages>
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
index 0e506fec42..8326df9881 100644
--- a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
+++ b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
@@ -56,8 +56,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SkiaSharp.1.49.4-beta\lib\net45\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.53.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SkiaSharp.1.53.0\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -116,12 +116,12 @@
   <Import Project="..\Avalonia.Skia\Avalonia.Skia.projitems" Label="Shared" />
   <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\..\..\packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\..\..\packages\SkiaSharp.1.53.0\build\net45\SkiaSharp.targets" Condition="Exists('..\..\..\packages\SkiaSharp.1.53.0\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\SkiaSharp.1.53.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SkiaSharp.1.53.0\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Skia/Avalonia.Skia.Desktop/packages.config b/src/Skia/Avalonia.Skia.Desktop/packages.config
index 8b8bbbd349..677d775736 100644
--- a/src/Skia/Avalonia.Skia.Desktop/packages.config
+++ b/src/Skia/Avalonia.Skia.Desktop/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.49.4-beta" targetFramework="net45" />
+  <package id="SkiaSharp" version="1.53.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
index d83ff538f5..b8e31eb56a 100644
--- a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
+++ b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
@@ -40,8 +40,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SkiaSharp.1.49.4-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.53.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SkiaSharp.1.53.0\lib\XamariniOS\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/Skia/Avalonia.Skia.iOS/packages.config b/src/Skia/Avalonia.Skia.iOS/packages.config
index 24649911de..faf56e0eea 100644
--- a/src/Skia/Avalonia.Skia.iOS/packages.config
+++ b/src/Skia/Avalonia.Skia.iOS/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.49.4-beta" targetFramework="xamarinios10" />
+  <package id="SkiaSharp" version="1.53.0" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file

From 241f8c01e72d65a4319b63935fd449038fce1cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Mon, 1 Aug 2016 18:58:50 +0200
Subject: [PATCH 2/4] Use latest SkiaSharp api

---
 src/Skia/Avalonia.Skia/BitmapImpl.cs              | 2 +-
 src/Skia/Avalonia.Skia/PlatformRenderInterface.cs | 4 ++--
 src/Skia/Avalonia.Skia/RenderTarget.cs            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/BitmapImpl.cs b/src/Skia/Avalonia.Skia/BitmapImpl.cs
index fc9963fecc..159e585218 100644
--- a/src/Skia/Avalonia.Skia/BitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/BitmapImpl.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Skia
         {
             PixelHeight = height;
             PixelWidth = width;
-            Bitmap = new SKBitmap(width, height, SKColorType.N_32, SKAlphaType.Premul);
+            Bitmap = new SKBitmap(width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul);
         }
 
         public void Dispose()
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index b1a0579e7d..1c1ebf4a08 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -30,8 +30,8 @@ namespace Avalonia.Skia
 
         IBitmapImpl LoadBitmap(byte[] data)
         {
-            var bitmap = new SKBitmap();
-            if (!SKImageDecoder.DecodeMemory(data, bitmap))
+            var bitmap = SKBitmap.Decode(data);
+            if (bitmap == null)
             {
                 throw new ArgumentException("Unable to load bitmap from provided data");
             }
diff --git a/src/Skia/Avalonia.Skia/RenderTarget.cs b/src/Skia/Avalonia.Skia/RenderTarget.cs
index 2c2a7420a0..1e1a5ff29d 100644
--- a/src/Skia/Avalonia.Skia/RenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/RenderTarget.cs
@@ -87,7 +87,7 @@ namespace Avalonia.Skia
                 _bitmap.Dispose();
             }
 
-            _bitmap = new SKBitmap(width, height, SKColorType.N_32, SKAlphaType.Premul);
+            _bitmap = new SKBitmap(width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul);
 
             IntPtr length;
             var pixels = _bitmap.GetPixels(out length);

From 0b5eb69cdfce2e8f20996800a1abee95965e84d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Mon, 1 Aug 2016 19:39:01 +0200
Subject: [PATCH 3/4] Use skia ArcTo method

---
 src/Skia/Avalonia.Skia/StreamGeometryImpl.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
index bde7a8ef9b..ddc66e1854 100644
--- a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
@@ -104,7 +104,15 @@ namespace Avalonia.Skia
 
             public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
             {
-                ArcToHelper.ArcTo(this, _currentPoint, point, size, rotationAngle, isLargeArc, sweepDirection);
+                _path.ArcTo(
+                    (float)size.Width,
+                    (float)size.Height,
+                    (float)rotationAngle,
+                    isLargeArc ? SKPathArcSize.Large : SKPathArcSize.Small,
+                    sweepDirection == SweepDirection.Clockwise ? SKPathDirection.Clockwise : SKPathDirection.CounterClockwise,
+                    (float)point.X,
+                    (float)point.Y);
+                _currentPoint = point;
             }
 
             public void BeginFigure(Point startPoint, bool isFilled)

From 8af935cb0ae9e0dbd3f9b1915faf0b4362755a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Mon, 1 Aug 2016 20:01:57 +0200
Subject: [PATCH 4/4] Implemented DashStyle support for Skia

---
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 26 ++++++--------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index c6672ce6c9..7744e15104 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -234,24 +234,14 @@ namespace Avalonia.Skia
 
             paint.StrokeMiter = (float)pen.MiterLimit;
 
-            // TODO: Implement Dash Style support
-            //
-            //if (pen.DashStyle?.Dashes != null)
-            //{
-            //	var dashes = pen.DashStyle.Dashes;
-            //	if (dashes.Count > NativeBrush.MaxDashCount)
-            //		throw new NotSupportedException("Maximum supported dash count is " + NativeBrush.MaxDashCount);
-            //	brush.Brush->StrokeDashCount = dashes.Count;
-            //	for (int c = 0; c < dashes.Count; c++)
-            //		brush.Brush->StrokeDashes[c] = (float)dashes[c];
-            //	brush.Brush->StrokeDashOffset = (float)pen.DashStyle.Offset;
-
-            //}
-
-            //if (brush->StrokeDashCount != 0)
-            //{
-            //	paint.setPathEffect(SkDashPathEffect::Create(brush->StrokeDashes, brush->StrokeDashCount, brush->StrokeDashOffset))->unref();
-            //}
+            if (pen.DashStyle?.Dashes != null && pen.DashStyle.Dashes.Count > 0)
+            {
+                var pe = SKPathEffect.CreateDash(
+                    pen.DashStyle?.Dashes.Select(x => (float)x).ToArray(),
+                    (float)pen.DashStyle.Offset);
+                paint.PathEffect = pe;
+                rv.AddDisposable(pe);
+            }
 
             return rv;
         }