From bf292c00660d6d2a37bdaddc275a2fe45ab28953 Mon Sep 17 00:00:00 2001 From: Isaac <> Date: Wed, 15 May 2024 14:57:37 +0400 Subject: [PATCH] Lottie cleanup --- .../CompLayers/CompositionLayer.cpp | 9 --------- .../CompLayers/CompositionLayer.hpp | 20 +------------------ .../CompLayers/CompositionLayerDelegate.hpp | 13 ------------ 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayerDelegate.hpp diff --git a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayer.cpp b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayer.cpp index e4fca1e328..db9e76ffc7 100644 --- a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayer.cpp +++ b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayer.cpp @@ -12,17 +12,8 @@ _inputMatte(inputMatte) { addSublayer(_inputMatte); } -void InvertedMatteLayer::setup() { - _inputMatte->setLayerDelegate(shared_from_base()); -} - -void InvertedMatteLayer::frameUpdated(double frame) { - setNeedsDisplay(true); -} - std::shared_ptr makeInvertedMatteLayer(std::shared_ptr compositionLayer) { auto result = std::make_shared(compositionLayer); - result->setup(); return result; } diff --git a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayer.hpp b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayer.hpp index 1d27bbd0ba..3399646a54 100644 --- a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayer.hpp +++ b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayer.hpp @@ -7,7 +7,6 @@ #include "Lottie/Private/Model/Layers/LayerModel.hpp" #include "Lottie/Private/MainThread/LayerContainers/Utility/LayerTransformNode.hpp" #include "Lottie/Private/MainThread/LayerContainers/CompLayers/MaskContainerLayer.hpp" -#include "Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayerDelegate.hpp" #include @@ -17,16 +16,12 @@ class CompositionLayer; class InvertedMatteLayer; /// A layer that inverses the alpha output of its input layer. -class InvertedMatteLayer: public CALayer, public CompositionLayerDelegate { +class InvertedMatteLayer: public CALayer { public: InvertedMatteLayer(std::shared_ptr inputMatte); - void setup(); - std::shared_ptr _inputMatte; - virtual void frameUpdated(double frame) override; - virtual bool isInvertedMatte() const override { return true; } @@ -103,10 +98,6 @@ public: _maskLayer->updateWithFrame(frame, forceUpdates); } } - - if (const auto delegate = _layerDelegate.lock()) { - delegate->frameUpdated(frame); - } } virtual void displayContentsWithFrame(double frame, bool forceUpdates) { @@ -132,13 +123,6 @@ public: } } - std::weak_ptr const &layerDelegate() const { - return _layerDelegate; - } - void setLayerDelegate(std::weak_ptr const &layerDelegate) { - _layerDelegate = layerDelegate; - } - std::shared_ptr const &contentsLayer() const { return _contentsLayer; } @@ -184,8 +168,6 @@ protected: std::optional _matteType; private: - std::weak_ptr _layerDelegate; - std::shared_ptr _transformNode; std::shared_ptr _maskLayer; diff --git a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayerDelegate.hpp b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayerDelegate.hpp deleted file mode 100644 index 59b05a3426..0000000000 --- a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/CompositionLayerDelegate.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef CompositionLayerDelegate_hpp -#define CompositionLayerDelegate_hpp - -namespace lottie { - -class CompositionLayerDelegate { -public: - virtual void frameUpdated(double frame) = 0; -}; - -} - -#endif /* CompositionLayerDelegate_hpp */