From 8528f1a33ecffc65887c94c32a48d64ffb7f12eb Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 17 May 2022 14:31:42 +1000
Subject: [PATCH] Optimize RestoreToBackground

---
 .../Formats/Webp/WebpAnimationDecoder.cs      | 11 ++-------
 src/ImageSharp/Memory/Buffer2DRegion{T}.cs    | 23 +++++++++++++++++++
 .../MemoryGroupExtensions.cs                  | 11 +++++++++
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/ImageSharp/Formats/Webp/WebpAnimationDecoder.cs b/src/ImageSharp/Formats/Webp/WebpAnimationDecoder.cs
index 73246778c..93ded17f8 100644
--- a/src/ImageSharp/Formats/Webp/WebpAnimationDecoder.cs
+++ b/src/ImageSharp/Formats/Webp/WebpAnimationDecoder.cs
@@ -356,15 +356,8 @@ namespace SixLabors.ImageSharp.Formats.Webp
 
             var interest = Rectangle.Intersect(imageFrame.Bounds(), this.restoreArea.Value);
             Buffer2DRegion<TPixel> pixelRegion = imageFrame.PixelBuffer.GetRegion(interest);
-            for (int y = 0; y < pixelRegion.Height; y++)
-            {
-                Span<TPixel> pixelRow = pixelRegion.DangerousGetRowSpan(y);
-                for (int x = 0; x < pixelRow.Length; x++)
-                {
-                    ref TPixel pixel = ref pixelRow[x];
-                    pixel.FromRgba32(backgroundColor);
-                }
-            }
+            TPixel backgroundPixel = backgroundColor.ToPixel<TPixel>();
+            pixelRegion.Fill(backgroundPixel);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/Buffer2DRegion{T}.cs b/src/ImageSharp/Memory/Buffer2DRegion{T}.cs
index 13b339597..9b9c1aa5b 100644
--- a/src/ImageSharp/Memory/Buffer2DRegion{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2DRegion{T}.cs
@@ -141,6 +141,9 @@ namespace SixLabors.ImageSharp.Memory
             return ref this.Buffer.DangerousGetRowSpan(y)[x];
         }
 
+        /// <summary>
+        /// Clears the contents of this <see cref="Buffer2DRegion{T}"/>.
+        /// </summary>
         internal void Clear()
         {
             // Optimization for when the size of the area is the same as the buffer size.
@@ -156,5 +159,25 @@ namespace SixLabors.ImageSharp.Memory
                 row.Clear();
             }
         }
+
+        /// <summary>
+        /// Fills the elements of this <see cref="Buffer2DRegion{T}"/> with the specified value.
+        /// </summary>
+        /// <param name="value">The value to assign to each element of the region.</param>
+        internal void Fill(T value)
+        {
+            // Optimization for when the size of the area is the same as the buffer size.
+            if (this.IsFullBufferArea)
+            {
+                this.Buffer.FastMemoryGroup.Fill(value);
+                return;
+            }
+
+            for (int y = 0; y < this.Rectangle.Height; y++)
+            {
+                Span<T> row = this.DangerousGetRowSpan(y);
+                row.Fill(value);
+            }
+        }
     }
 }
diff --git a/src/ImageSharp/Memory/DiscontiguousBuffers/MemoryGroupExtensions.cs b/src/ImageSharp/Memory/DiscontiguousBuffers/MemoryGroupExtensions.cs
index d200b223a..7a4e0df5d 100644
--- a/src/ImageSharp/Memory/DiscontiguousBuffers/MemoryGroupExtensions.cs
+++ b/src/ImageSharp/Memory/DiscontiguousBuffers/MemoryGroupExtensions.cs
@@ -7,6 +7,12 @@ namespace SixLabors.ImageSharp.Memory
 {
     internal static class MemoryGroupExtensions
     {
+        /// <summary>
+        /// Fills the elements of this <see cref="IMemoryGroup{T}"/> with the specified value.
+        /// </summary>
+        /// <typeparam name="T">The type of element.</typeparam>
+        /// <param name="group">The group to fill.</param>
+        /// <param name="value">The value to assign to each element of the group.</param>
         internal static void Fill<T>(this IMemoryGroup<T> group, T value)
             where T : struct
         {
@@ -16,6 +22,11 @@ namespace SixLabors.ImageSharp.Memory
             }
         }
 
+        /// <summary>
+        /// Clears the contents of this <see cref="IMemoryGroup{T}"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of element.</typeparam>
+        /// <param name="group">The group to clear.</param>
         internal static void Clear<T>(this IMemoryGroup<T> group)
             where T : struct
         {