WPF - Fix incorrect param ordering of IRenderHandler.OnPaint

amaitland · amaitland · commit 93fdd6352534 · 2018-04-23T13:06:05.000+10:00
Param order now matches CEF interface
diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs
@@ -785,7 +785,7 @@ protected virtual void OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int
 
             var img = isPopup ? popupImage : image;
 
-            RenderHandler?.OnPaint(isPopup, buffer, dirtyRect, width, height, img);
+            RenderHandler?.OnPaint(isPopup, dirtyRect, buffer, width, height, img);
         }
 
         /// <summary>
diff --git a/CefSharp.Wpf/IRenderHandler.cs b/CefSharp.Wpf/IRenderHandler.cs
@@ -8,13 +8,13 @@
 
 namespace CefSharp.Wpf
 {
-	/// <summary>
-	/// Implement this interface to handle Offscreen Rendering (OSR).
-	/// NOTE: Currently only OnPaint is implemented, at some point expand the API to include all
-	/// of CefRenderHandler methods http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderHandler.html
-	/// </summary>
-	public interface IRenderHandler : IDisposable
-	{
-		void OnPaint(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image);
-	}
+    /// <summary>
+    /// Implement this interface to handle Offscreen Rendering (OSR).
+    /// NOTE: Currently only OnPaint is implemented, at some point expand the API to include all
+    /// of CefRenderHandler methods http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderHandler.html
+    /// </summary>
+    public interface IRenderHandler : IDisposable
+    {
+        void OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image);
+    }
 }
diff --git a/CefSharp.Wpf/Rendering/Experimental/ByteArrayWritableBitmapRenderHandler.cs b/CefSharp.Wpf/Rendering/Experimental/ByteArrayWritableBitmapRenderHandler.cs
@@ -49,7 +49,7 @@ public ByteArrayWritableBitmapRenderHandler(double dpiX, double dpiY, bool inval
             this.dispatcherPriority = dispatcherPriority;
         }
 
-        void IRenderHandler.OnPaint(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image)
+        void IRenderHandler.OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image)
         {
             if (image.Dispatcher.HasShutdownStarted)
             {
diff --git a/CefSharp.Wpf/Rendering/Experimental/IncreaseBufferInteropRenderHandler.cs b/CefSharp.Wpf/Rendering/Experimental/IncreaseBufferInteropRenderHandler.cs
@@ -58,19 +58,19 @@ public void Dispose()
             ReleaseMemoryMappedView(ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);
         }
 
-        void IRenderHandler.OnPaint(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image)
+        void IRenderHandler.OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image)
         {
             if (isPopup)
             {
-                CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);
+                CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);
             }
             else
             {
-                CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);
+                CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);
             }
         }
 
-        private void CreateOrUpdateBitmap(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)
+        private void CreateOrUpdateBitmap(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)
         {
             if (image.Dispatcher.HasShutdownStarted)
             {
diff --git a/CefSharp.Wpf/Rendering/InteropBitmapRenderHandler.cs b/CefSharp.Wpf/Rendering/InteropBitmapRenderHandler.cs
@@ -58,19 +58,19 @@ public void Dispose()
             ReleaseMemoryMappedView(ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);
         }
 
-        void IRenderHandler.OnPaint(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image)
+        void IRenderHandler.OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image)
         {
             if (isPopup)
             {
-                CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);
+                CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);
             }
             else
             {
-                CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);
+                CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);
             }
         }
 
-        private void CreateOrUpdateBitmap(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)
+        private void CreateOrUpdateBitmap(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)
         {
             if (image.Dispatcher.HasShutdownStarted)
             {
diff --git a/CefSharp.Wpf/Rendering/WritableBitmapRenderHandler.cs b/CefSharp.Wpf/Rendering/WritableBitmapRenderHandler.cs
@@ -67,19 +67,19 @@ public void Dispose()
             ReleaseMemoryMappedView(ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);
         }
 
-        void IRenderHandler.OnPaint(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image)
+        void IRenderHandler.OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image)
         {
             if (isPopup)
             {
-                CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);
+                CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);
             }
             else
             {
-                CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);
+                CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);
             }
         }
 
-        private void CreateOrUpdateBitmap(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)
+        private void CreateOrUpdateBitmap(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)
         {
             bool createNewBitmap = false;
 

Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@ protected virtual void OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int`
`785`	`785`
`786`	`786`	`var img = isPopup ? popupImage : image;`
`787`	`787`
`788`		`- RenderHandler?.OnPaint(isPopup, buffer, dirtyRect, width, height, img);`
	`788`	`+ RenderHandler?.OnPaint(isPopup, dirtyRect, buffer, width, height, img);`
`789`	`789`	`}`
`790`	`790`
`791`	`791`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public ByteArrayWritableBitmapRenderHandler(double dpiX, double dpiY, bool inval`
`49`	`49`	`this.dispatcherPriority = dispatcherPriority;`
`50`	`50`	`}`
`51`	`51`
`52`		`- void IRenderHandler.OnPaint(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image)`
	`52`	`+ void IRenderHandler.OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image)`
`53`	`53`	`{`
`54`	`54`	`if (image.Dispatcher.HasShutdownStarted)`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,19 +58,19 @@ public void Dispose()`
`58`	`58`	`ReleaseMemoryMappedView(ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);`
`59`	`59`	`}`
`60`	`60`
`61`		`- void IRenderHandler.OnPaint(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image)`
	`61`	`+ void IRenderHandler.OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image)`
`62`	`62`	`{`
`63`	`63`	`if (isPopup)`
`64`	`64`	`{`
`65`		`- CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);`
	`65`	`+ CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);`
`66`	`66`	`}`
`67`	`67`	`else`
`68`	`68`	`{`
`69`		`- CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);`
	`69`	`+ CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- private void CreateOrUpdateBitmap(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)`
	`73`	`+ private void CreateOrUpdateBitmap(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)`
`74`	`74`	`{`
`75`	`75`	`if (image.Dispatcher.HasShutdownStarted)`
`76`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,19 +67,19 @@ public void Dispose()`
`67`	`67`	`ReleaseMemoryMappedView(ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);`
`68`	`68`	`}`
`69`	`69`
`70`		`- void IRenderHandler.OnPaint(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image)`
	`70`	`+ void IRenderHandler.OnPaint(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image)`
`71`	`71`	`{`
`72`	`72`	`if (isPopup)`
`73`	`73`	`{`
`74`		`- CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);`
	`74`	`+ CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref popupSize, ref popupMemoryMappedFile, ref popupMemoryMappedViewAccessor);`
`75`	`75`	`}`
`76`	`76`	`else`
`77`	`77`	`{`
`78`		`- CreateOrUpdateBitmap(isPopup, buffer, dirtyRect, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);`
	`78`	`+ CreateOrUpdateBitmap(isPopup, dirtyRect, buffer, width, height, image, ref viewSize, ref viewMemoryMappedFile, ref viewMemoryMappedViewAccessor);`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- private void CreateOrUpdateBitmap(bool isPopup, IntPtr buffer, Rect dirtyRect, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)`
	`82`	`+ private void CreateOrUpdateBitmap(bool isPopup, Rect dirtyRect, IntPtr buffer, int width, int height, Image image, ref Size currentSize, ref MemoryMappedFile mappedFile, ref MemoryMappedViewAccessor viewAccessor)`
`83`	`83`	`{`
`84`	`84`	`bool createNewBitmap = false;`
`85`	`85`