From 6bfb23a84b35a5ff0ecc2a86c71313cb0cc1b270 Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Tue, 19 Dec 2023 13:17:15 +0900 Subject: [PATCH] [Tizen] Print processor name for debug Change-Id: Iefc357da0e56ed2c482c89a0a819b997aa953fa3 Signed-off-by: Eunki, Hong --- .../rive-animation-renderer-manager.h | 20 ++++++----- .../rive-animation-view/rive-animation-manager.h | 8 +++++ .../vector-animation-plugin-manager.h | 39 +++++++++++----------- 3 files changed, 39 insertions(+), 28 deletions(-) mode change 100755 => 100644 dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer-manager.h mode change 100755 => 100644 dali-extension/vector-animation-renderer/vector-animation-plugin-manager.h diff --git a/dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer-manager.h b/dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer-manager.h old mode 100755 new mode 100644 index d760654..760d59f --- a/dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer-manager.h +++ b/dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer-manager.h @@ -2,7 +2,7 @@ #define DALI_EXTENSION_INTERNAL_RIVE_ANIMATION_RENDERER_MANAGER_H /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 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. @@ -19,10 +19,10 @@ */ // EXTERNAL INCLUDES -#include -#include #include +#include #include +#include #include // INTERNAL INCLUDES @@ -34,14 +34,12 @@ namespace Extension { namespace Internal { - /** * @brief Rive animation renderer manager */ class RiveAnimationRendererManager : public Integration::Processor { public: - /** * @brief Create or retrieve RiveAnimationRendererManager singleton. * @@ -69,21 +67,26 @@ public: void TriggerEvent(RiveAnimationRendererEventHandler& handler); protected: // Implementation of Processor - /** * @copydoc Dali::Integration::Processor::Process() */ void Process(bool postProcessor) override; -private: + /** + * @copydoc Dali::Integration::Processor::GetProcessorName() + */ + std::string_view GetProcessorName() const override + { + return "RiveAnimationRendererManager"; + } +private: /** * @brief Event callback to process events. */ void OnEventTriggered(); private: - /** * @brief Constructor. */ @@ -101,7 +104,6 @@ private: RiveAnimationRendererManager& operator=(const RiveAnimationRendererManager&) = delete; private: - std::vector mEventHandlers; std::vector mTriggeredHandlers; Dali::Mutex mMutex; diff --git a/dali-extension/internal/rive-animation-view/rive-animation-manager.h b/dali-extension/internal/rive-animation-view/rive-animation-manager.h index ba08c60..73bb14b 100644 --- a/dali-extension/internal/rive-animation-view/rive-animation-manager.h +++ b/dali-extension/internal/rive-animation-view/rive-animation-manager.h @@ -99,6 +99,14 @@ protected: // Implementation of Processor */ void Process(bool postProcessor) override; + /** + * @copydoc Dali::Integration::Processor::GetProcessorName() + */ + std::string_view GetProcessorName() const override + { + return "RiveAnimationManager"; + } + private: // Undefined RiveAnimationManager(const RiveAnimationManager& manager) = delete; diff --git a/dali-extension/vector-animation-renderer/vector-animation-plugin-manager.h b/dali-extension/vector-animation-renderer/vector-animation-plugin-manager.h old mode 100755 new mode 100644 index f973003..540d48e --- a/dali-extension/vector-animation-renderer/vector-animation-plugin-manager.h +++ b/dali-extension/vector-animation-renderer/vector-animation-plugin-manager.h @@ -19,10 +19,10 @@ */ // EXTERNAL INCLUDES -#include -#include #include +#include #include +#include #include // INTERNAL INCLUDES @@ -30,17 +30,14 @@ namespace Dali { - namespace Plugin { - /** * @brief Tizen vector animation manager */ class VectorAnimationPluginManager : public Integration::Processor { public: - /** * @brief Create or retrieve VectorAnimationPluginManager singleton. * @@ -53,36 +50,41 @@ public: * * @param handler The event handler to add. */ - void AddEventHandler( VectorAnimationEventHandler& handler ); + void AddEventHandler(VectorAnimationEventHandler& handler); /** * @brief Remove the event handler. * * @param handler The event handler to remove. */ - void RemoveEventHandler( VectorAnimationEventHandler& handler ); + void RemoveEventHandler(VectorAnimationEventHandler& handler); /** * @brief Trigger the event. */ - void TriggerEvent( VectorAnimationEventHandler& handler ); + void TriggerEvent(VectorAnimationEventHandler& handler); protected: // Implementation of Processor - /** * @copydoc Dali::Integration::Processor::Process() */ void Process(bool postProcessor) override; -private: + /** + * @copydoc Dali::Integration::Processor::GetProcessorName() + */ + std::string_view GetProcessorName() const override + { + return "VectorAnimationPluginManager"; + } +private: /** * @brief Event callback to process events. */ void OnEventTriggered(); private: - /** * @brief Constructor. */ @@ -94,21 +96,20 @@ private: virtual ~VectorAnimationPluginManager(); // Undefined - VectorAnimationPluginManager( const VectorAnimationPluginManager& ) = delete; + VectorAnimationPluginManager(const VectorAnimationPluginManager&) = delete; // Undefined - VectorAnimationPluginManager& operator=( const VectorAnimationPluginManager& ) = delete; + VectorAnimationPluginManager& operator=(const VectorAnimationPluginManager&) = delete; private: - - std::vector< VectorAnimationEventHandler* > mEventHandlers; - std::vector< VectorAnimationEventHandler* > mTriggeredHandlers; - Dali::Mutex mMutex; - std::unique_ptr< EventThreadCallback > mEventTrigger; + std::vector mEventHandlers; + std::vector mTriggeredHandlers; + Dali::Mutex mMutex; + std::unique_ptr mEventTrigger; }; } // namespace Plugin -} // namespace Dali; +} // namespace Dali #endif // DALI_TIZEN_VECTOR_ANIMATION_MANAGER_H -- 2.7.4