diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index cb324506c4..4ea0a199eb 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -42,6 +42,11 @@ namespace Avalonia.Skia
///
public struct CreateInfo
{
+ ///
+ /// Canvas to draw to.
+ ///
+ public SKCanvas Canvas;
+
///
/// Surface to draw to.
///
@@ -89,7 +94,7 @@ namespace Avalonia.Skia
if (_grContext != null)
Monitor.Enter(_grContext);
Surface = createInfo.Surface;
- Canvas = createInfo.Surface.Canvas;
+ Canvas = createInfo.Canvas ?? createInfo.Surface?.Canvas;
if (Canvas == null)
{
diff --git a/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
new file mode 100644
index 0000000000..72438609d5
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
@@ -0,0 +1,31 @@
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using SkiaSharp;
+
+namespace Avalonia.Skia.Helpers
+{
+ public class DrawingContextHelper
+ {
+ ///
+ /// Wrap Skia canvas in drawing context so we can use Avalonia api to render to external skia canvas
+ /// this is useful in scenarios where canvas is not controlled by application, but received from another non avalonia api
+ /// like: SKCanvas canvas = SKDocument.BeginPage(...);
+ ///
+ ///
+ ///
+ ///
+ /// DrawingContext
+ public static IDrawingContextImpl WrapSkiaCanvas(SKCanvas canvas, Vector dpi, IVisualBrushRenderer visualBrushRenderer = null)
+ {
+ var createInfo = new DrawingContextImpl.CreateInfo
+ {
+ Canvas = canvas,
+ Dpi = dpi,
+ VisualBrushRenderer = visualBrushRenderer,
+ DisableTextLcdRendering = true,
+ };
+
+ return new DrawingContextImpl(createInfo);
+ }
+ }
+}