[dali_2.3.22] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / animated-vector-image / vector-animation-manager.cpp

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.cpp
index 2286ea0..430a0c5 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h>
@@ -37,11 +38,12 @@ namespace
 Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VECTOR_ANIMATION");
 #endif
 
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_IMAGE_PERFORMANCE_MARKER, false);
+
 } // unnamed namespace
 
 VectorAnimationManager::VectorAnimationManager()
 : mEventCallbacks(),
-  mLifecycleObservers(),
   mVectorAnimationThread(nullptr),
   mProcessorRegistered(false)
 {
@@ -49,35 +51,11 @@ VectorAnimationManager::VectorAnimationManager()
 
 VectorAnimationManager::~VectorAnimationManager()
 {
-  for(auto&& iter : mEventCallbacks)
-  {
-    delete iter;
-  }
   mEventCallbacks.clear();
 
-  if(mProcessorRegistered)
-  {
-    Adaptor::Get().UnregisterProcessor(*this);
-  }
-
-  for(auto observer : mLifecycleObservers)
+  if(mProcessorRegistered && Adaptor::IsAvailable())
   {
-    observer->VectorAnimationManagerDestroyed();
-  }
-}
-
-void VectorAnimationManager::AddObserver(VectorAnimationManager::LifecycleObserver& observer)
-{
-  DALI_ASSERT_DEBUG(mLifecycleObservers.end() == std::find(mLifecycleObservers.begin(), mLifecycleObservers.end(), &observer));
-  mLifecycleObservers.push_back(&observer);
-}
-
-void VectorAnimationManager::RemoveObserver(VectorAnimationManager::LifecycleObserver& observer)
-{
-  auto iterator = std::find(mLifecycleObservers.begin(), mLifecycleObservers.end(), &observer);
-  if(iterator != mLifecycleObservers.end())
-  {
-    mLifecycleObservers.erase(iterator);
+    Adaptor::Get().UnregisterProcessor(*this, true);
   }
 }
 
@@ -93,18 +71,22 @@ VectorAnimationThread& VectorAnimationManager::GetVectorAnimationThread()
 
 void VectorAnimationManager::RegisterEventCallback(CallbackBase* callback)
 {
-  mEventCallbacks.push_back(callback);
+  mEventCallbacks.emplace_back(std::unique_ptr<Dali::CallbackBase>(callback));
 
   if(!mProcessorRegistered)
   {
-    Adaptor::Get().RegisterProcessor(*this);
+    Adaptor::Get().RegisterProcessor(*this, true); // Use post processor to trigger after layoutting
     mProcessorRegistered = true;
   }
 }
 
 void VectorAnimationManager::UnregisterEventCallback(CallbackBase* callback)
 {
-  auto iter = std::find(mEventCallbacks.begin(), mEventCallbacks.end(), callback);
+  auto iter = std::find_if(mEventCallbacks.begin(),
+                           mEventCallbacks.end(),
+                           [callback](const std::unique_ptr<CallbackBase>& element) {
+                             return element.get() == callback;
+                           });
   if(iter != mEventCallbacks.end())
   {
     mEventCallbacks.erase(iter);
@@ -113,23 +95,46 @@ void VectorAnimationManager::UnregisterEventCallback(CallbackBase* callback)
     {
       if(Adaptor::IsAvailable())
       {
-        Adaptor::Get().UnregisterProcessor(*this);
+        Adaptor::Get().UnregisterProcessor(*this, true);
         mProcessorRegistered = false;
       }
     }
   }
 }
 
-void VectorAnimationManager::Process()
+void VectorAnimationManager::Process(bool postProcessor)
 {
+#ifdef TRACE_ENABLED
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    if(mEventCallbacks.size() > 0u)
+    {
+      std::ostringstream oss;
+      oss << "[" << mEventCallbacks.size() << "]";
+      DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_VECTOR_ANIMATION_MANAGER_PROCESS", oss.str().c_str());
+    }
+  }
+#endif
+
   for(auto&& iter : mEventCallbacks)
   {
     CallbackBase::Execute(*iter);
-    delete iter;
   }
+
+#ifdef TRACE_ENABLED
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    if(mEventCallbacks.size() > 0u)
+    {
+      std::ostringstream oss;
+      oss << "[" << mEventCallbacks.size() << "]";
+      DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_VECTOR_ANIMATION_MANAGER_PROCESS", oss.str().c_str());
+    }
+  }
+#endif
   mEventCallbacks.clear();
 
-  Adaptor::Get().UnregisterProcessor(*this);
+  Adaptor::Get().UnregisterProcessor(*this, true);
   mProcessorRegistered = false;
 }