refactor(composition): use Composition constructors for CompositionEf…

…fectFactory, CompositionBackdropBrush, and CompositionEffectBrush
jeromelaban · Mar 2, 2024 · cb0cbe4 · cb0cbe4
1 parent 58ce7db
commit cb0cbe4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/src/Uno.UI.Composition/Composition/CompositionBackdropBrush.cs b/src/Uno.UI.Composition/Composition/CompositionBackdropBrush.cs
@@ -0,0 +1,9 @@
+#nullable enable
+
+namespace Windows.UI.Composition
+{
+	public partial class CompositionBackdropBrush : CompositionBrush
+	{
+		internal CompositionBackdropBrush(Compositor compositor) : base(compositor) { }
+	}
+}
diff --git a/src/Uno.UI.Composition/Composition/CompositionEffectBrush.cs b/src/Uno.UI.Composition/Composition/CompositionEffectBrush.cs
@@ -12,7 +12,7 @@ public partial class CompositionEffectBrush : CompositionBrush
 
 		private Dictionary<string, CompositionBrush> _sourceParameters;
 
-		internal CompositionEffectBrush(IGraphicsEffect graphicsEffect, IEnumerable<string>? animatableProperties = null)
+		internal CompositionEffectBrush(Compositor compositor, IGraphicsEffect graphicsEffect, IEnumerable<string>? animatableProperties = null) : base(compositor)
 		{
 			_effect = graphicsEffect;
 			//_animatableProperties = animatableProperties; // TODO (see the TODO note above)

diff --git a/src/Uno.UI.Composition/Composition/CompositionEffectFactory.cs b/src/Uno.UI.Composition/Composition/CompositionEffectFactory.cs
@@ -15,7 +15,7 @@ public partial class CompositionEffectFactory : CompositionObject
 		private CompositionEffectFactoryLoadStatus _loadStatus;
 		private Exception? _extendedError;
 
-		internal CompositionEffectFactory(IGraphicsEffect effect, IEnumerable<string>? animatableProperties = null)
+		internal CompositionEffectFactory(Compositor compositor, IGraphicsEffect effect, IEnumerable<string>? animatableProperties = null) : base(compositor)
 		{
 			if (effect is null)
 			{
@@ -34,7 +34,7 @@ internal CompositionEffectFactory(IGraphicsEffect effect, IEnumerable<string>? a
 			_animatableProperties = animatableProperties;
 		}
 
-		public CompositionEffectBrush? CreateBrush() => new(_effect, _animatableProperties);
+		public CompositionEffectBrush? CreateBrush() => new(Compositor, _effect, _animatableProperties);
 
 		public CompositionEffectFactoryLoadStatus LoadStatus => _loadStatus;
 		public Exception? ExtendedError => _extendedError;

diff --git a/src/Uno.UI.Composition/Composition/Compositor.cs b/src/Uno.UI.Composition/Composition/Compositor.cs
@@ -165,13 +165,13 @@ public ExpressionAnimation CreateExpressionAnimation(string expression)
 
 		internal void InvalidateRender(Visual visual) => InvalidateRenderPartial(visual);
 		public CompositionBackdropBrush CreateBackdropBrush()
-			=> new CompositionBackdropBrush();
+			=> new CompositionBackdropBrush(this);
 
 		public CompositionEffectFactory CreateEffectFactory(IGraphicsEffect graphicsEffect)
-			=> new CompositionEffectFactory(graphicsEffect);
+			=> new CompositionEffectFactory(this, graphicsEffect);
 
 		public CompositionEffectFactory CreateEffectFactory(IGraphicsEffect graphicsEffect, IEnumerable<string> animatableProperties)
-			=> new CompositionEffectFactory(graphicsEffect, animatableProperties);
+			=> new CompositionEffectFactory(this, graphicsEffect, animatableProperties);
 
 		partial void InvalidateRenderPartial(Visual visual);
 	}

diff --git a/src/Uno.UWP/Generated/3.0.0.0/Windows.UI.Composition/CompositionBackdropBrush.cs b/src/Uno.UWP/Generated/3.0.0.0/Windows.UI.Composition/CompositionBackdropBrush.cs
@@ -8,10 +8,6 @@ namespace Windows.UI.Composition
 #endif
 	public partial class CompositionBackdropBrush : global::Windows.UI.Composition.CompositionBrush
 	{
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
-		internal CompositionBackdropBrush()
-		{
-		}
-#endif
+
 	}
 }