From cb0cbe40ad8d26b8c1c91904d1e54a27e0545a46 Mon Sep 17 00:00:00 2001 From: ahmed walid Date: Tue, 3 Oct 2023 03:45:18 +0200 Subject: [PATCH] refactor(composition): use Composition constructors for CompositionEffectFactory, CompositionBackdropBrush, and CompositionEffectBrush --- .../Composition/CompositionBackdropBrush.cs | 9 +++++++++ .../Composition/CompositionEffectBrush.cs | 2 +- .../Composition/CompositionEffectFactory.cs | 4 ++-- src/Uno.UI.Composition/Composition/Compositor.cs | 6 +++--- .../Windows.UI.Composition/CompositionBackdropBrush.cs | 6 +----- 5 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 src/Uno.UI.Composition/Composition/CompositionBackdropBrush.cs diff --git a/src/Uno.UI.Composition/Composition/CompositionBackdropBrush.cs b/src/Uno.UI.Composition/Composition/CompositionBackdropBrush.cs new file mode 100644 index 000000000000..98eb7022970f --- /dev/null +++ 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 index 31b1bf7c3e35..77cb6a173043 100644 --- 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 _sourceParameters; - internal CompositionEffectBrush(IGraphicsEffect graphicsEffect, IEnumerable? animatableProperties = null) + internal CompositionEffectBrush(Compositor compositor, IGraphicsEffect graphicsEffect, IEnumerable? 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 index b17dc49d0e08..e079117e0440 100644 --- 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? animatableProperties = null) + internal CompositionEffectFactory(Compositor compositor, IGraphicsEffect effect, IEnumerable? animatableProperties = null) : base(compositor) { if (effect is null) { @@ -34,7 +34,7 @@ internal CompositionEffectFactory(IGraphicsEffect effect, IEnumerable? 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 index bb442b4b4971..eefbeb7485ae 100644 --- 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 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 index b61f16c4a054..3afbdf0a10be 100644 --- 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 + } }