WPF - CompositionTargetRenderHandler add null check

amaitland · amaitland · commit a0ddd9487393 · 2022-04-20T12:16:24.000+10:00
diff --git a/CefSharp.Wpf/Rendering/Experimental/CompositionTargetRenderHandler.cs b/CefSharp.Wpf/Rendering/Experimental/CompositionTargetRenderHandler.cs
@@ -8,7 +8,6 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Threading;
 using Rect = CefSharp.Structs.Rect;
 
 namespace CefSharp.Wpf.Rendering.Experimental
@@ -109,7 +108,7 @@ private void OnRendering(object sender, EventArgs args)
 
         private void UpdateImage(PaintElement element)
         {
-            if (element.IsDirty && element.Image != null)
+            if (element != null && element.IsDirty && element.Image != null)
             {
                 var bitmap = element.Image.Source as WriteableBitmap;
                 if (bitmap == null || bitmap.PixelWidth != element.Width || bitmap.PixelHeight != element.Height)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using System.Windows.Controls;`
`9`	`9`	`using System.Windows.Media;`
`10`	`10`	`using System.Windows.Media.Imaging;`
`11`		`-using System.Windows.Threading;`
`12`	`11`	`using Rect = CefSharp.Structs.Rect;`
`13`	`12`
`14`	`13`	`namespace CefSharp.Wpf.Rendering.Experimental`
`@@ -109,7 +108,7 @@ private void OnRendering(object sender, EventArgs args)`
`109`	`108`
`110`	`109`	`private void UpdateImage(PaintElement element)`
`111`	`110`	`{`
`112`		`- if (element.IsDirty && element.Image != null)`
	`111`	`+ if (element != null && element.IsDirty && element.Image != null)`
`113`	`112`	`{`
`114`	`113`	`var bitmap = element.Image.Source as WriteableBitmap;`
`115`	`114`	`if (bitmap == null \|\| bitmap.PixelWidth != element.Width \|\| bitmap.PixelHeight != element.Height)`