WPF ByteArrayWritableBitmapRenderHandler - Remove base class

AbstractRenderHandler - change pixel properties to internal so they can be shared ByteArrayWritableBitmapRenderHandler
WritableBitmapRenderHandler - run Format Document (changed fields to read only)

Follow up to #2652

Author: amaitland

CefSharp.Wpf/Rendering/AbstractRenderHandler.cs

@@ -23,8 +23,8 @@ public abstract class AbstractRenderHandler : IDisposable, IRenderHandler
         [DllImport("kernel32.dll", EntryPoint = "CopyMemory", SetLastError = false)]
         protected static extern void CopyMemory(IntPtr dest, IntPtr src, uint count);
 
-        protected static readonly PixelFormat PixelFormat = PixelFormats.Pbgra32;
-        protected static int BytesPerPixel = PixelFormat.BitsPerPixel / 8;
+        internal static readonly PixelFormat PixelFormat = PixelFormats.Pbgra32;
+        internal static int BytesPerPixel = PixelFormat.BitsPerPixel / 8;
 
         protected object lockObject = new object();
 

CefSharp.Wpf/Rendering/Experimental/ByteArrayWritableBitmapRenderHandler.cs

@@ -3,12 +3,12 @@
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
 using System;
-using System.IO.MemoryMappedFiles;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
+
 using Rect = CefSharp.Structs.Rect;
 
 namespace CefSharp.Wpf.Rendering.Experimental
@@ -20,11 +20,12 @@ namespace CefSharp.Wpf.Rendering.Experimental
     /// wise.
     /// </summary>
     /// <seealso cref="CefSharp.Wpf.IRenderHandler" />
-    public class ByteArrayWritableBitmapRenderHandler : AbstractRenderHandler
+    public class ByteArrayWritableBitmapRenderHandler : IRenderHandler
     {
-        private double dpiX;
-        private double dpiY;
-        private bool invalidateDirtyRect;
+        private readonly double dpiX;
+        private readonly double dpiY;
+        private readonly bool invalidateDirtyRect;
+        private readonly DispatcherPriority dispatcherPriority;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WritableBitmapRenderHandler"/> class.
@@ -41,11 +42,28 @@ public ByteArrayWritableBitmapRenderHandler(double dpiX, double dpiY, bool inval
             this.dispatcherPriority = dispatcherPriority;
         }
 
-        protected override void CreateOrUpdateBitmap(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)
+        /// <summary>
+        /// Called when an element has been rendered to the shared texture handle.
+        /// This method is only called when <see cref="IWindowInfo.SharedTextureEnabled"/> is set to true
+        /// </summary>
+        /// <param name="isPopup">indicates whether the element is the view or the popup widget.</param>
+        /// <param name="dirtyRect">contains the set of rectangles in pixel coordinates that need to be repainted</param>
+        /// <param name="sharedHandle">is the handle for a D3D11 Texture2D that can be accessed via ID3D11Device using the OpenSharedResource method.</param>
+        void IRenderHandler.OnAcceleratedPaint(bool isPopup, Rect dirtyRect, IntPtr sharedHandle)
+        {
+            //NOT USED
+        }
+
+        void IRenderHandler.OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image)
         {
+            if (image.Dispatcher.HasShutdownStarted)
+            {
+                return;
+            }
+
             int pixels = width * height;
-            int numberOfBytes = pixels * BytesPerPixel;
-            var stride = width * BytesPerPixel;
+            int numberOfBytes = pixels * AbstractRenderHandler.BytesPerPixel;
+            var stride = width * AbstractRenderHandler.BytesPerPixel;
             var tempBuffer = new byte[numberOfBytes];
 
             //Copy unmanaged memory to our buffer
@@ -63,7 +81,7 @@ protected override void CreateOrUpdateBitmap(bool isPopup, Rect dirtyRect, IntPt
                         GC.Collect(1);
                     }
 
-                    image.Source = bitmap = new WriteableBitmap(width, height, dpiX, dpiY, PixelFormat, null);
+                    image.Source = bitmap = new WriteableBitmap(width, height, dpiX, dpiY, AbstractRenderHandler.PixelFormat, null);
                 }
 
                 //Get a ptr to our temp buffer
@@ -92,5 +110,10 @@ protected override void CreateOrUpdateBitmap(bool isPopup, Rect dirtyRect, IntPt
                 }
             }), dispatcherPriority);
         }
+
+        void IDisposable.Dispose()
+        {
+
+        }
     }
 }

CefSharp.Wpf/Rendering/WritableBitmapRenderHandler.cs

@@ -20,9 +20,9 @@ namespace CefSharp.Wpf.Rendering
     /// <seealso cref="CefSharp.Wpf.IRenderHandler" />
     public class WritableBitmapRenderHandler : AbstractRenderHandler
     {
-        private double dpiX;
-        private double dpiY;
-        private bool invalidateDirtyRect;
+        private readonly double dpiX;
+        private readonly double dpiY;
+        private readonly bool invalidateDirtyRect;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WritableBitmapRenderHandler"/> class.