Some performance improvements for Forms (#1424)

mono · Jul 23, 2020 · c62ce46 · c62ce46
1 parent b84f667
commit c62ce46
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 16 deletions.
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SKCanvasViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SKCanvasViewRenderer.cs
@@ -23,5 +23,10 @@ public SKCanvasViewRenderer()
 			: base()
 		{
 		}
+
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKCanvasViewRenderer)
+				? new SKNativeView(Context)
+				: base.CreateNativeControl();
 	}
 }
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SKGLViewRenderer.cs
@@ -39,7 +39,9 @@ protected override void SetupRenderLoop(bool oneShot)
 
 		protected override SKNativeView CreateNativeControl()
 		{
-			var view = base.CreateNativeControl();
+			var view = GetType() == typeof(SKGLViewRenderer)
+				? new SKNativeView(Context)
+				: base.CreateNativeControl();
 
 			// Force the opacity to false for consistency with the other platforms
 			view.SetOpaque(false);

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.GTK/SKCanvasViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.GTK/SKCanvasViewRenderer.cs
@@ -9,5 +9,9 @@ namespace SkiaSharp.Views.Forms
 {
 	public class SKCanvasViewRenderer : SKCanvasViewRendererBase<SKFormsView, SKNativeView>, IRegisterable
 	{
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKCanvasViewRenderer)
+				? new SKNativeView()
+				: base.CreateNativeControl();
 	}
 }
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.GTK/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.GTK/SKGLViewRenderer.cs
@@ -4,7 +4,7 @@ internal class SKGLViewRenderer
 	{
 		public SKGLViewRenderer()
 		{
-			throw new System.PlatformNotSupportedException("SKGLView is not yet supported on this platform.");
+			throw new System.PlatformNotSupportedException("SKGLView is not yet supported on GTK.");
 		}
 	}
 }

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SKCanvasViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SKCanvasViewRenderer.cs
@@ -9,10 +9,9 @@ namespace SkiaSharp.Views.Forms
 {
 	public class SKCanvasViewRenderer : SKCanvasViewRendererBase<SKFormsView, SKNativeView>
 	{
-		protected override SKNativeView CreateNativeControl()
-		{
-			var view = base.CreateNativeControl();
-			return view;
-		}
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKCanvasViewRenderer)
+				? new SKNativeView()
+				: base.CreateNativeControl();
 	}
 }
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SKGLViewRenderer.cs
@@ -1,5 +1,4 @@
 using CoreVideo;
-using Foundation;
 using Xamarin.Forms;
 
 using SKFormsView = SkiaSharp.Views.Forms.SKGLView;
@@ -13,11 +12,10 @@ public class SKGLViewRenderer : SKGLViewRendererBase<SKFormsView, SKNativeView>
 	{
 		private CVDisplayLink displayLink;
 
-		protected override SKNativeView CreateNativeControl()
-		{
-			var view = base.CreateNativeControl();
-			return view;
-		}
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKGLViewRenderer)
+				? new SKNativeView()
+				: base.CreateNativeControl();
 
 		protected override void Dispose(bool disposing)
 		{

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKCanvasViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKCanvasViewRenderer.cs
@@ -1,5 +1,7 @@
 using Xamarin.Forms;
 
+using TForms = Xamarin.Forms.Forms;
+
 using SKFormsView = SkiaSharp.Views.Forms.SKCanvasView;
 using SKNativeView = SkiaSharp.Views.Tizen.SKCanvasView;
 
@@ -9,5 +11,9 @@ namespace SkiaSharp.Views.Forms
 {
 	public class SKCanvasViewRenderer : SKCanvasViewRendererBase<SKFormsView, SKNativeView>, IRegisterable
 	{
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKCanvasViewRenderer)
+				? new SKNativeView(TForms.NativeParent)
+				: base.CreateNativeControl();
 	}
 }
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKGLViewRenderer.cs
@@ -1,6 +1,8 @@
 using SkiaSharp.Views.Tizen;
 using Xamarin.Forms;
 
+using TForms = Xamarin.Forms.Forms;
+
 using SKFormsView = SkiaSharp.Views.Forms.SKGLView;
 using SKNativeView = SkiaSharp.Views.Tizen.SKGLSurfaceView;
 
@@ -10,6 +12,11 @@ namespace SkiaSharp.Views.Forms
 {
 	public class SKGLViewRenderer : SKGLViewRendererBase<SKFormsView, SKNativeView>
 	{
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKGLViewRenderer)
+				? new SKNativeView(TForms.NativeParent)
+				: base.CreateNativeControl();
+
 		protected override void SetupRenderLoop(bool oneShot)
 		{
 			if (oneShot)

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SKCanvasViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SKCanvasViewRenderer.cs
@@ -9,5 +9,9 @@ namespace SkiaSharp.Views.Forms
 {
 	public class SKCanvasViewRenderer : SKCanvasViewRendererBase<SKFormsView, SKNativeView>
 	{
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKCanvasViewRenderer)
+				? new SKNativeView()
+				: base.CreateNativeControl();
 	}
 }
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SKGLViewRenderer.cs
@@ -9,6 +9,11 @@ namespace SkiaSharp.Views.Forms
 {
 	public class SKGLViewRenderer : SKGLViewRendererBase<SKFormsView, SKNativeView>
 	{
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKGLViewRenderer)
+				? new SKNativeView()
+				: base.CreateNativeControl();
+
 		protected override void SetupRenderLoop(bool oneShot)
 		{
 			if (oneShot)

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKCanvasViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKCanvasViewRenderer.cs
@@ -10,5 +10,9 @@ namespace SkiaSharp.Views.Forms
 {
 	public class SKCanvasViewRenderer : SKCanvasViewRendererBase<SKFormsView, SKNativeView>, IRegisterable
 	{
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKCanvasViewRenderer)
+				? new SKNativeView()
+				: base.CreateNativeControl();
 	}
 }
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SKGLViewRenderer.cs
@@ -13,6 +13,11 @@ public class SKGLViewRenderer : SKGLViewRendererBase<SKFormsView, SKNativeView>
 	{
 		private DispatcherTimer renderTimer;
 
+		protected override SKNativeView CreateNativeControl() =>
+			GetType() == typeof(SKGLViewRenderer)
+				? new SKNativeView()
+				: base.CreateNativeControl();
+
 		protected override void SetupRenderLoop(bool oneShot)
 		{
 			// only start if we haven't already

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKCanvasViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKCanvasViewRenderer.cs
@@ -16,7 +16,9 @@ public SKCanvasViewRenderer()
 
 		protected override SKNativeView CreateNativeControl()
 		{
-			var view = base.CreateNativeControl();
+			var view = GetType() == typeof(SKCanvasViewRenderer)
+				? new SKNativeView()
+				: base.CreateNativeControl();
 
 			// Force the opacity to false for consistency with the other platforms
 			view.Opaque = false;

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKGLViewRenderer.cs
@@ -20,7 +20,9 @@ public SKGLViewRenderer()
 
 		protected override SKNativeView CreateNativeControl()
 		{
-			var view = base.CreateNativeControl();
+			var view = GetType() == typeof(SKGLViewRenderer)
+				? new SKNativeView()
+				: base.CreateNativeControl();
 
 			// Force the opacity to false for consistency with the other platforms
 			view.Opaque = false;

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SKGLViewRenderer.cs
@@ -4,7 +4,7 @@ internal class SKGLViewRenderer
 	{
 		public SKGLViewRenderer()
 		{
-			throw new System.PlatformNotSupportedException("SKGLView is not yet supported on GTK.");
+			throw new System.PlatformNotSupportedException("SKGLView is not yet supported on this platform.");
 		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ internal class SKGLViewRenderer @@
     	{
     		public SKGLViewRenderer()
     		{
-    			throw new System.PlatformNotSupportedException("SKGLView is not yet supported on this platform.");
+    			throw new System.PlatformNotSupportedException("SKGLView is not yet supported on GTK.");
     		}
     	}
     }
@@ Expand Down @@