Move canvas convenience APIs to extensions

Author: JimBobSquarePants

src/ImageSharp.Drawing.WebGPU/WebGPURuntime.cs

@@ -406,22 +406,6 @@ internal static int RunComputePipelineSupportProbe()
         }
     }
 
-    /// <summary>
-    /// Process-exit cleanup callback.
-    /// </summary>
-    /// <param name="sender">Event sender.</param>
-    /// <param name="e">Event arguments.</param>
-    private static void OnProcessExit(object? sender, EventArgs e)
-    {
-        _ = sender;
-        _ = e;
-
-        lock (Sync)
-        {
-            DisposeRuntimeCore();
-        }
-    }
-
     private static void DisposeRuntimeCore()
     {
         ClearDeviceStateCache();
@@ -476,7 +460,14 @@ private static void EnsureInitialized()
     {
         if (!processExitHooked)
         {
-            AppDomain.CurrentDomain.ProcessExit += OnProcessExit;
+            AppDomain.CurrentDomain.ProcessExit += (_, _) =>
+            {
+                lock (Sync)
+                {
+                    DisposeRuntimeCore();
+                }
+            };
+
             processExitHooked = true;
         }
 

src/ImageSharp.Drawing/Processing/DrawingCanvasShapeExtensions.cs

@@ -4,10 +4,38 @@
 namespace SixLabors.ImageSharp.Drawing.Processing;
 
 /// <summary>
-/// Convenience shape helpers that build paths and forward to the core <see cref="IDrawingCanvas"/> fill and draw primitives.
+/// Convenience canvas helpers that forward to the core <see cref="IDrawingCanvas"/> primitives.
 /// </summary>
 public static class DrawingCanvasShapeExtensions
 {
+    /// <summary>
+    /// Saves the current drawing state and begins an isolated compositing layer over the whole canvas.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <returns>The save count after the layer state has been pushed.</returns>
+    public static int SaveLayer(this IDrawingCanvas canvas)
+        => canvas.SaveLayer(new GraphicsOptions(), canvas.Bounds);
+
+    /// <summary>
+    /// Saves the current drawing state and begins an isolated compositing layer over the whole canvas.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="layerOptions">Graphics options controlling how the layer is composited on restore.</param>
+    /// <returns>The save count after the layer state has been pushed.</returns>
+    public static int SaveLayer(this IDrawingCanvas canvas, GraphicsOptions layerOptions)
+        => canvas.SaveLayer(layerOptions, canvas.Bounds);
+
+    /// <summary>
+    /// Fills the whole canvas using the given brush.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade destination pixels.</param>
+    public static void Fill(this IDrawingCanvas canvas, Brush brush)
+    {
+        Rectangle bounds = canvas.Bounds;
+        canvas.Fill(brush, new RectangularPolygon(bounds.X, bounds.Y, bounds.Width, bounds.Height));
+    }
+
     /// <summary>
     /// Fills a local region using the given brush.
     /// </summary>
@@ -17,6 +45,26 @@ public static class DrawingCanvasShapeExtensions
     public static void Fill(this IDrawingCanvas canvas, Brush brush, Rectangle region)
         => canvas.Fill(brush, new RectangularPolygon(region.X, region.Y, region.Width, region.Height));
 
+    /// <summary>
+    /// Clears the whole canvas using the given brush and clear-style composition options.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade destination pixels during clear.</param>
+    public static void Clear(this IDrawingCanvas canvas, Brush brush)
+    {
+        Rectangle bounds = canvas.Bounds;
+        canvas.Clear(brush, new RectangularPolygon(bounds.X, bounds.Y, bounds.Width, bounds.Height));
+    }
+
+    /// <summary>
+    /// Clears a local region using the given brush and clear-style composition options.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade destination pixels during clear.</param>
+    /// <param name="region">Region to clear in local coordinates.</param>
+    public static void Clear(this IDrawingCanvas canvas, Brush brush, Rectangle region)
+        => canvas.Clear(brush, new RectangularPolygon(region.X, region.Y, region.Width, region.Height));
+
     /// <summary>
     /// Fills all paths in a collection using the given brush.
     /// </summary>

src/ImageSharp.Drawing/Processing/DrawingCanvas{TPixel}.cs

@@ -191,14 +191,6 @@ private int SaveCore(DrawingOptions options, IReadOnlyList<IPath> clipPaths)
         return this.savedStates.Count;
     }
 
-    /// <inheritdoc />
-    public int SaveLayer()
-        => this.SaveLayer(new GraphicsOptions());
-
-    /// <inheritdoc />
-    public int SaveLayer(GraphicsOptions layerOptions)
-        => this.SaveLayer(layerOptions, this.Bounds);
-
     /// <inheritdoc />
     public int SaveLayer(GraphicsOptions layerOptions, Rectangle bounds)
     {
@@ -278,22 +270,6 @@ public DrawingCanvas<TPixel> CreateRegion(Rectangle region)
     IDrawingCanvas IDrawingCanvas.CreateRegion(Rectangle region)
         => this.CreateRegion(region);
 
-    /// <inheritdoc />
-    public void Clear(Brush brush)
-    {
-        DrawingCanvasState state = this.ResolveState();
-        DrawingOptions options = state.Options.CloneForClearOperation();
-        this.ExecuteWithTemporaryState(options, state.ClipPaths, () => this.Fill(brush));
-    }
-
-    /// <inheritdoc />
-    public void Clear(Brush brush, Rectangle region)
-    {
-        DrawingCanvasState state = this.ResolveState();
-        DrawingOptions options = state.Options.CloneForClearOperation();
-        this.ExecuteWithTemporaryState(options, state.ClipPaths, () => this.Fill(brush, region));
-    }
-
     /// <inheritdoc />
     public void Clear(Brush brush, IPath path)
     {
@@ -302,10 +278,6 @@ public void Clear(Brush brush, IPath path)
         this.ExecuteWithTemporaryState(options, state.ClipPaths, () => this.Fill(brush, path));
     }
 
-    /// <inheritdoc />
-    public void Fill(Brush brush)
-        => this.Fill(brush, new RectangularPolygon(this.Bounds.X, this.Bounds.Y, this.Bounds.Width, this.Bounds.Height));
-
     /// <inheritdoc />
     public void Fill(Brush brush, IPath path)
     {

src/ImageSharp.Drawing/Processing/IDrawingCanvas.cs

@@ -45,28 +45,6 @@ public interface IDrawingCanvas : IDisposable
     /// <returns>The save count after the previous state has been pushed.</returns>
     public int Save(DrawingOptions options, params IPath[] clipPaths);
 
-    /// <summary>
-    /// Saves the current drawing state and begins an isolated compositing layer.
-    /// Subsequent draw commands are recorded into an isolated logical layer. When
-    /// <see cref="Restore"/> closes the layer, that layer becomes eligible for
-    /// composition during the next <see cref="Flush"/> or <see cref="IDisposable.Dispose"/>.
-    /// </summary>
-    /// <returns>The save count after the layer state has been pushed.</returns>
-    public int SaveLayer();
-
-    /// <summary>
-    /// Saves the current drawing state and begins an isolated compositing layer.
-    /// Subsequent draw commands are recorded into an isolated logical layer. When
-    /// <see cref="Restore"/> closes the layer, that layer is composed during the next
-    /// <see cref="Flush"/> or <see cref="IDisposable.Dispose"/> using the specified
-    /// <paramref name="layerOptions"/> (blend mode, alpha composition, opacity).
-    /// </summary>
-    /// <param name="layerOptions">
-    /// Graphics options controlling how the layer is composited on restore.
-    /// </param>
-    /// <returns>The save count after the layer state has been pushed.</returns>
-    public int SaveLayer(GraphicsOptions layerOptions);
-
     /// <summary>
     /// Saves the current drawing state and begins an isolated compositing layer
     /// bounded to a subregion. Subsequent draw commands are recorded into that isolated
@@ -113,32 +91,13 @@ public interface IDrawingCanvas : IDisposable
     /// <returns>A child canvas with local origin at (0,0).</returns>
     public IDrawingCanvas CreateRegion(Rectangle region);
 
-    /// <summary>
-    /// Clears the whole canvas using the given brush and clear-style composition options.
-    /// </summary>
-    /// <param name="brush">Brush used to shade destination pixels during clear.</param>
-    public void Clear(Brush brush);
-
-    /// <summary>
-    /// Clears a local region using the given brush and clear-style composition options.
-    /// </summary>
-    /// <param name="brush">Brush used to shade destination pixels during clear.</param>
-    /// <param name="region">Region to clear in local coordinates.</param>
-    public void Clear(Brush brush, Rectangle region);
-
     /// <summary>
     /// Clears a path region using the given brush and clear-style composition options.
     /// </summary>
     /// <param name="brush">Brush used to shade destination pixels during clear.</param>
     /// <param name="path">The path region to clear.</param>
     public void Clear(Brush brush, IPath path);
 
-    /// <summary>
-    /// Fills the whole canvas using the given brush.
-    /// </summary>
-    /// <param name="brush">Brush used to shade destination pixels.</param>
-    public void Fill(Brush brush);
-
     /// <summary>
     /// Fills a path in local coordinates using the given brush.
     /// </summary>