From ce08964f0371452ce8301cd2206d6e32f295982f Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 20 Oct 2020 20:34:51 +0100
Subject: [PATCH] refactor how surface origin is passed.

---
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs      | 5 +++--
 src/Skia/Avalonia.Skia/PlatformRenderInterface.cs | 2 +-
 src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs     | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 136b14140e..98692b7483 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -974,10 +974,11 @@ namespace Avalonia.Skia
                 Format = format,
                 DisableTextLcdRendering = !_canTextUseLcdRendering,
                 GrContext = _grContext,
-                Gpu = _gpu
+                Gpu = _gpu,
+                SurfaceOrigin = _session?.SurfaceOrigin ?? GRSurfaceOrigin.TopLeft
             };
 
-            return new SurfaceRenderTarget(createInfo, _session?.SurfaceOrigin ?? GRSurfaceOrigin.TopLeft);
+            return new SurfaceRenderTarget(createInfo);
         }        
 
         /// <summary>
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index 6048482110..d6f76a2c20 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -127,7 +127,7 @@ namespace Avalonia.Skia
                 DisableTextLcdRendering = false
             };
 
-            return new SurfaceRenderTarget(createInfo, GRSurfaceOrigin.TopLeft);
+            return new SurfaceRenderTarget(createInfo);
         }
 
         /// <inheritdoc />
diff --git a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
index 905c9160a7..d3d4515689 100644
--- a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Skia
         /// Create new surface render target.
         /// </summary>
         /// <param name="createInfo">Create info.</param>
-        public SurfaceRenderTarget(CreateInfo createInfo, GRSurfaceOrigin surfaceOrigin)
+        public SurfaceRenderTarget(CreateInfo createInfo)
         {
             PixelSize = new PixelSize(createInfo.Width, createInfo.Height);
             Dpi = createInfo.Dpi;
@@ -51,7 +51,7 @@ namespace Avalonia.Skia
             _grContext = createInfo.GrContext;
             _gpu = createInfo.Gpu;
 
-            _surface = _gpu?.TryCreateSurface(PixelSize, surfaceOrigin);
+            _surface = _gpu?.TryCreateSurface(PixelSize, createInfo.SurfaceOrigin);
             if (_surface == null)
                 _surface = new SkiaSurfaceWrapper(CreateSurface(createInfo.GrContext, PixelSize.Width, PixelSize.Height,
                     createInfo.Format));
@@ -218,6 +218,8 @@ namespace Avalonia.Skia
             public GRContext GrContext;
 
             public ISkiaGpu Gpu;
+
+            public GRSurfaceOrigin SurfaceOrigin;
         }
     }
 }