perf(macOS): Avoid calling NSView.Layer getter more than once / method

spouliot · spouliot · commit 3ced78d566c6 · 2022-06-17T11:06:02.000-04:00
diff --git a/src/Uno.UI/Controls/BindableNSView.macOS.cs b/src/Uno.UI/Controls/BindableNSView.macOS.cs
@@ -58,9 +58,10 @@ public BindableNSView()
 		{
 			Initialize();
 			WantsLayer = true;
-			if (Layer != null)
+			var layer = Layer;
+			if (layer != null)
 			{
-				Layer.MasksToBounds = false;
+				layer.MasksToBounds = false;
 			}
 		}
 
diff --git a/src/Uno.UI/Media/NativeRenderTransformAdapter.iOSmacOS.cs b/src/Uno.UI/Media/NativeRenderTransformAdapter.iOSmacOS.cs
@@ -35,7 +35,8 @@ partial void Initialized()
 			if (Owner is FrameworkElement element && !element.IsLoaded)
 			{
 				_isDeferring = true;
-				element.Layer.Opacity = 0;
+				var layer = element.Layer;
+				layer.Opacity = 0;
 				element.Loaded += DeferredInitialize;
 
 				_deferredInitialization = Disposable.Create(CompleteInitialization);
@@ -56,7 +57,7 @@ void CompleteInitialization()
 					element.Loaded -= DeferredInitialize;
 
 					_isDeferring = false;
-					element.Layer.Opacity = 1;
+					layer.Opacity = 1;
 
 					if (!_isDisposed)
 					{
@@ -77,13 +78,14 @@ void CompleteInitialization()
 
 		private void InitializeOrigin()
 		{
-			var oldFrame = Owner.Layer.Frame;
+			var layer = Owner.Layer;
+			var oldFrame = layer.Frame;
 
-			Owner.Layer.AnchorPoint = CurrentOrigin;
+			layer.AnchorPoint = CurrentOrigin;
 
 			// Restore the old frame to correct the offset potentially introduced by changing AnchorPoint. This is safe to do since we know
 			// that the transform is currently identity.
-			Owner.Layer.Frame = oldFrame;
+			layer.Frame = oldFrame;
 		}
 
 		partial void Apply(bool isSizeChanged, bool isOriginChanged)
@@ -94,14 +96,15 @@ partial void Apply(bool isSizeChanged, bool isOriginChanged)
 				return;
 			}
 #endif
+			var layer = Owner.Layer;
 			if (Transform.IsAnimating)
 			{
 				// While animating the transform, we let the Animator apply the transform by itself, so do not update the Transform
 				if (!_wasAnimating)
 				{
 					// At the beginning of the animation make sure we disable all properties of the transform
-					Owner.Layer.AnchorPoint = GPUFloatValueAnimator.GetAnchorForAnimation(Transform, CurrentOrigin, CurrentSize);
-					Owner.Layer.Transform = CoreAnimation.CATransform3D.Identity;
+					layer.AnchorPoint = GPUFloatValueAnimator.GetAnchorForAnimation(Transform, CurrentOrigin, CurrentSize);
+					layer.Transform = CoreAnimation.CATransform3D.Identity;
 
 					_wasAnimating = true;
 				}
@@ -112,8 +115,8 @@ partial void Apply(bool isSizeChanged, bool isOriginChanged)
 			{
 				// Make sure to fully restore the transform at the end of an animation
 
-				Owner.Layer.AnchorPoint = CurrentOrigin;
-				Owner.Layer.Transform = _transform = Transform.MatrixCore.ToTransform3D();
+				layer.AnchorPoint = CurrentOrigin;
+				layer.Transform = _transform = Transform.MatrixCore.ToTransform3D();
 
 				_wasAnimating = false;
 
@@ -124,15 +127,15 @@ partial void Apply(bool isSizeChanged, bool isOriginChanged)
 			{
 				// As we use the 'AnchorPoint', the transform matrix is independent of the size of the control
 				// But the layouter expects from us that we restore the transform on each measuring phase
-				Owner.Layer.Transform = _transform;
+				layer.Transform = _transform;
 			}
 			else if (isOriginChanged)
 			{
-				Owner.Layer.AnchorPoint = CurrentOrigin;
+				layer.AnchorPoint = CurrentOrigin;
 			}
 			else
 			{
-				Owner.Layer.Transform = _transform = Transform.MatrixCore.ToTransform3D();
+				layer.Transform = _transform = Transform.MatrixCore.ToTransform3D();
 			}
 		}
 
diff --git a/src/Uno.UI/UI/Xaml/Controls/Layouter/Layouter.macOS.cs b/src/Uno.UI/UI/Xaml/Controls/Layouter/Layouter.macOS.cs
@@ -111,6 +111,7 @@ private IDisposable SettingFrame(View view)
 
 			// If NSView.Transform is not identity, then modifying the frame will give undefined behavior. (https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIView_Class/#//apple_ref/occ/instp/NSView/transform)
 			// We have either already applied the transform to the new frame, or we will reset the transform straight after.
+			// FIXME: view.Layer called twice (thrice with above check)
 			var transform = view.Layer.Transform;
 			view.Layer.Transform = CATransform3D.Identity;
 			return Disposable.Create(reapplyTransform);
diff --git a/src/Uno.UI/UI/Xaml/IFrameworkElementImplementation.macOS.tt b/src/Uno.UI/UI/Xaml/IFrameworkElementImplementation.macOS.tt
@@ -366,12 +366,13 @@ namespace <#= mixin.NamespaceName #>
 #endif
 
 				CoreAnimation.CATransform3D? oldTransform = null;
-				if (Layer != null && !Layer.Transform.IsIdentity)
+				var layer = Layer;
+				if (layer != null && !layer.Transform.IsIdentity)
 				{
 					// If NSView.Transform is not identity, then modifying the frame will give undefined behavior. (https://developer.apple.com/library/ios/documentation/UIKit/Reference/NSView_Class/#//apple_ref/occ/instp/NSView/transform)
 					// We reapply the transform based on the new size straight after.
-					oldTransform = Layer.Transform;
-					Layer.Transform = CoreAnimation.CATransform3D.Identity;
+					oldTransform = layer.Transform;
+					layer.Transform = CoreAnimation.CATransform3D.Identity;
 				}
 
 				base.Frame = value;
@@ -389,13 +390,13 @@ namespace <#= mixin.NamespaceName #>
 					else if (oldTransform.HasValue)
 					{
 						// We grudgingly support setting the native transform directly without going through RenderTransform.
-						Layer.Transform = oldTransform.Value;
+						layer.Transform = oldTransform.Value;
 					}
 				}
 				else if (oldTransform.HasValue)
 				{
 					// We grudgingly support setting the native transform directly without going through RenderTransform.
-					Layer.Transform = oldTransform.Value;
+					layer.Transform = oldTransform.Value;
 				}
 			}
 		}
@@ -882,17 +883,18 @@ namespace <#= mixin.NamespaceName #>
 			{
 				WantsLayer = true;
 
+				var layer = Layer;
 				if(e.NewValue is SolidColorBrush scb)
 				{
-					Layer.BackgroundColor = scb.ColorWithOpacity;
+					layer.BackgroundColor = scb.ColorWithOpacity;
 
 					_brushColorChanged.Disposable = scb.RegisterDisposablePropertyChangedCallback(
 						SolidColorBrush.ColorProperty,
-						(s, colorArg) => Layer.BackgroundColor = (s as SolidColorBrush).ColorWithOpacity
+						(s, colorArg) => layer.BackgroundColor = (s as SolidColorBrush).ColorWithOpacity
 					);
 					_brushOpacityChanged.Disposable = scb.RegisterDisposablePropertyChangedCallback(
 						SolidColorBrush.OpacityProperty,
-						(s, colorArg) => Layer.BackgroundColor = (s as SolidColorBrush).ColorWithOpacity
+						(s, colorArg) => layer.BackgroundColor = (s as SolidColorBrush).ColorWithOpacity
 					);
 				}
 				else
@@ -901,15 +903,15 @@ namespace <#= mixin.NamespaceName #>
 					_brushOpacityChanged.Disposable = null;
 					if(e.NewValue is GradientBrush gb)
 					{
-						Layer.BackgroundColor = gb.FallbackColorWithOpacity;
+						layer.BackgroundColor = gb.FallbackColorWithOpacity;
 					}
 					else
 					{
 						if (this.Log().IsEnabled(Uno.Foundation.Logging.LogLevel.Warning))
 						{
 							this.Log().Warn("Brush is not a SolidColorBrush, ignoring");
 						}
-						Layer.BackgroundColor = SolidColorBrushHelper.Transparent.Color;
+						layer.BackgroundColor = SolidColorBrushHelper.Transparent.Color;
 					}
 				}
 			}
diff --git a/src/Uno.UI/UI/Xaml/UIElement.macOS.cs b/src/Uno.UI/UI/Xaml/UIElement.macOS.cs
@@ -262,18 +262,16 @@ partial void ApplyNativeClip(Rect rect)
 			{
 				if (!ClippingIsSetByCornerRadius)
 				{
-					if (Layer != null)
-					{
-						this.Layer.Mask = null;
-					}
+					Layer.Mask = null;
 				}
 				return;
 			}
 
 			WantsLayer = true;
-			if (Layer != null)
+			var layer = Layer;
+			if (layer != null)
 			{
-				this.Layer.Mask = new CAShapeLayer
+				layer.Mask = new CAShapeLayer
 				{
 					Path = CGPath.FromRect(rect.ToCGRect())
 				};

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,10 @@ public BindableNSView()`
`58`	`58`	`{`
`59`	`59`	`Initialize();`
`60`	`60`	`WantsLayer = true;`
`61`		`- if (Layer != null)`
	`61`	`+ var layer = Layer;`
	`62`	`+ if (layer != null)`
`62`	`63`	`{`
`63`		`- Layer.MasksToBounds = false;`
	`64`	`+ layer.MasksToBounds = false;`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ partial void Initialized()`
`35`	`35`	`if (Owner is FrameworkElement element && !element.IsLoaded)`
`36`	`36`	`{`
`37`	`37`	`_isDeferring = true;`
`38`		`- element.Layer.Opacity = 0;`
	`38`	`+ var layer = element.Layer;`
	`39`	`+ layer.Opacity = 0;`
`39`	`40`	`element.Loaded += DeferredInitialize;`
`40`	`41`
`41`	`42`	`_deferredInitialization = Disposable.Create(CompleteInitialization);`
`@@ -56,7 +57,7 @@ void CompleteInitialization()`
`56`	`57`	`element.Loaded -= DeferredInitialize;`
`57`	`58`
`58`	`59`	`_isDeferring = false;`
`59`		`- element.Layer.Opacity = 1;`
	`60`	`+ layer.Opacity = 1;`
`60`	`61`
`61`	`62`	`if (!_isDisposed)`
`62`	`63`	`{`
`@@ -77,13 +78,14 @@ void CompleteInitialization()`
`77`	`78`
`78`	`79`	`private void InitializeOrigin()`
`79`	`80`	`{`
`80`		`- var oldFrame = Owner.Layer.Frame;`
	`81`	`+ var layer = Owner.Layer;`
	`82`	`+ var oldFrame = layer.Frame;`
`81`	`83`
`82`		`- Owner.Layer.AnchorPoint = CurrentOrigin;`
	`84`	`+ layer.AnchorPoint = CurrentOrigin;`
`83`	`85`
`84`	`86`	`// Restore the old frame to correct the offset potentially introduced by changing AnchorPoint. This is safe to do since we know`
`85`	`87`	`// that the transform is currently identity.`
`86`		`- Owner.Layer.Frame = oldFrame;`
	`88`	`+ layer.Frame = oldFrame;`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`partial void Apply(bool isSizeChanged, bool isOriginChanged)`
`@@ -94,14 +96,15 @@ partial void Apply(bool isSizeChanged, bool isOriginChanged)`
`94`	`96`	`return;`
`95`	`97`	`}`
`96`	`98`	`#endif`
	`99`	`+ var layer = Owner.Layer;`
`97`	`100`	`if (Transform.IsAnimating)`
`98`	`101`	`{`
`99`	`102`	`// While animating the transform, we let the Animator apply the transform by itself, so do not update the Transform`
`100`	`103`	`if (!_wasAnimating)`
`101`	`104`	`{`
`102`	`105`	`// At the beginning of the animation make sure we disable all properties of the transform`
`103`		`- Owner.Layer.AnchorPoint = GPUFloatValueAnimator.GetAnchorForAnimation(Transform, CurrentOrigin, CurrentSize);`
`104`		`- Owner.Layer.Transform = CoreAnimation.CATransform3D.Identity;`
	`106`	`+ layer.AnchorPoint = GPUFloatValueAnimator.GetAnchorForAnimation(Transform, CurrentOrigin, CurrentSize);`
	`107`	`+ layer.Transform = CoreAnimation.CATransform3D.Identity;`
`105`	`108`
`106`	`109`	`_wasAnimating = true;`
`107`	`110`	`}`
`@@ -112,8 +115,8 @@ partial void Apply(bool isSizeChanged, bool isOriginChanged)`
`112`	`115`	`{`
`113`	`116`	`// Make sure to fully restore the transform at the end of an animation`
`114`	`117`
`115`		`- Owner.Layer.AnchorPoint = CurrentOrigin;`
`116`		`- Owner.Layer.Transform = _transform = Transform.MatrixCore.ToTransform3D();`
	`118`	`+ layer.AnchorPoint = CurrentOrigin;`
	`119`	`+ layer.Transform = _transform = Transform.MatrixCore.ToTransform3D();`
`117`	`120`
`118`	`121`	`_wasAnimating = false;`
`119`	`122`
`@@ -124,15 +127,15 @@ partial void Apply(bool isSizeChanged, bool isOriginChanged)`
`124`	`127`	`{`
`125`	`128`	`// As we use the 'AnchorPoint', the transform matrix is independent of the size of the control`
`126`	`129`	`// But the layouter expects from us that we restore the transform on each measuring phase`
`127`		`- Owner.Layer.Transform = _transform;`
	`130`	`+ layer.Transform = _transform;`
`128`	`131`	`}`
`129`	`132`	`else if (isOriginChanged)`
`130`	`133`	`{`
`131`		`- Owner.Layer.AnchorPoint = CurrentOrigin;`
	`134`	`+ layer.AnchorPoint = CurrentOrigin;`
`132`	`135`	`}`
`133`	`136`	`else`
`134`	`137`	`{`
`135`		`- Owner.Layer.Transform = _transform = Transform.MatrixCore.ToTransform3D();`
	`138`	`+ layer.Transform = _transform = Transform.MatrixCore.ToTransform3D();`
`136`	`139`	`}`
`137`	`140`	`}`
`138`	`141`
Original file line number	Diff line number	Diff line change
`@@ -366,12 +366,13 @@ namespace <#= mixin.NamespaceName #>`
`366`	`366`	`#endif`
`367`	`367`
`368`	`368`	`CoreAnimation.CATransform3D? oldTransform = null;`
`369`		`- if (Layer != null && !Layer.Transform.IsIdentity)`
	`369`	`+ var layer = Layer;`
	`370`	`+ if (layer != null && !layer.Transform.IsIdentity)`
`370`	`371`	`{`
`371`	`372`	`// If NSView.Transform is not identity, then modifying the frame will give undefined behavior. (https://developer.apple.com/library/ios/documentation/UIKit/Reference/NSView_Class/#//apple_ref/occ/instp/NSView/transform)`
`372`	`373`	`// We reapply the transform based on the new size straight after.`
`373`		`- oldTransform = Layer.Transform;`
`374`		`- Layer.Transform = CoreAnimation.CATransform3D.Identity;`
	`374`	`+ oldTransform = layer.Transform;`
	`375`	`+ layer.Transform = CoreAnimation.CATransform3D.Identity;`
`375`	`376`	`}`
`376`	`377`
`377`	`378`	`base.Frame = value;`
`@@ -389,13 +390,13 @@ namespace <#= mixin.NamespaceName #>`
`389`	`390`	`else if (oldTransform.HasValue)`
`390`	`391`	`{`
`391`	`392`	`// We grudgingly support setting the native transform directly without going through RenderTransform.`
`392`		`- Layer.Transform = oldTransform.Value;`
	`393`	`+ layer.Transform = oldTransform.Value;`
`393`	`394`	`}`
`394`	`395`	`}`
`395`	`396`	`else if (oldTransform.HasValue)`
`396`	`397`	`{`
`397`	`398`	`// We grudgingly support setting the native transform directly without going through RenderTransform.`
`398`		`- Layer.Transform = oldTransform.Value;`
	`399`	`+ layer.Transform = oldTransform.Value;`
`399`	`400`	`}`
`400`	`401`	`}`
`401`	`402`	`}`
`@@ -882,17 +883,18 @@ namespace <#= mixin.NamespaceName #>`
`882`	`883`	`{`
`883`	`884`	`WantsLayer = true;`
`884`	`885`
	`886`	`+ var layer = Layer;`
`885`	`887`	`if(e.NewValue is SolidColorBrush scb)`
`886`	`888`	`{`
`887`		`- Layer.BackgroundColor = scb.ColorWithOpacity;`
	`889`	`+ layer.BackgroundColor = scb.ColorWithOpacity;`
`888`	`890`
`889`	`891`	`_brushColorChanged.Disposable = scb.RegisterDisposablePropertyChangedCallback(`
`890`	`892`	`SolidColorBrush.ColorProperty,`
`891`		`- (s, colorArg) => Layer.BackgroundColor = (s as SolidColorBrush).ColorWithOpacity`
	`893`	`+ (s, colorArg) => layer.BackgroundColor = (s as SolidColorBrush).ColorWithOpacity`
`892`	`894`	`);`
`893`	`895`	`_brushOpacityChanged.Disposable = scb.RegisterDisposablePropertyChangedCallback(`
`894`	`896`	`SolidColorBrush.OpacityProperty,`
`895`		`- (s, colorArg) => Layer.BackgroundColor = (s as SolidColorBrush).ColorWithOpacity`
	`897`	`+ (s, colorArg) => layer.BackgroundColor = (s as SolidColorBrush).ColorWithOpacity`
`896`	`898`	`);`
`897`	`899`	`}`
`898`	`900`	`else`
`@@ -901,15 +903,15 @@ namespace <#= mixin.NamespaceName #>`
`901`	`903`	`_brushOpacityChanged.Disposable = null;`
`902`	`904`	`if(e.NewValue is GradientBrush gb)`
`903`	`905`	`{`
`904`		`- Layer.BackgroundColor = gb.FallbackColorWithOpacity;`
	`906`	`+ layer.BackgroundColor = gb.FallbackColorWithOpacity;`
`905`	`907`	`}`
`906`	`908`	`else`
`907`	`909`	`{`
`908`	`910`	`if (this.Log().IsEnabled(Uno.Foundation.Logging.LogLevel.Warning))`
`909`	`911`	`{`
`910`	`912`	`this.Log().Warn("Brush is not a SolidColorBrush, ignoring");`
`911`	`913`	`}`
`912`		`- Layer.BackgroundColor = SolidColorBrushHelper.Transparent.Color;`
	`914`	`+ layer.BackgroundColor = SolidColorBrushHelper.Transparent.Color;`
`913`	`915`	`}`
`914`	`916`	`}`
`915`	`917`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,18 +262,16 @@ partial void ApplyNativeClip(Rect rect)`
`262`	`262`	`{`
`263`	`263`	`if (!ClippingIsSetByCornerRadius)`
`264`	`264`	`{`
`265`		`- if (Layer != null)`
`266`		`- {`
`267`		`- this.Layer.Mask = null;`
`268`		`- }`
	`265`	`+ Layer.Mask = null;`
`269`	`266`	`}`
`270`	`267`	`return;`
`271`	`268`	`}`
`272`	`269`
`273`	`270`	`WantsLayer = true;`
`274`		`- if (Layer != null)`
	`271`	`+ var layer = Layer;`
	`272`	`+ if (layer != null)`
`275`	`273`	`{`
`276`		`- this.Layer.Mask = new CAShapeLayer`
	`274`	`+ layer.Mask = new CAShapeLayer`
`277`	`275`	`{`
`278`	`276`	`Path = CGPath.FromRect(rect.ToCGRect())`
`279`	`277`	`};`