From: Heeyong Song Date: Tue, 12 Nov 2019 06:16:46 +0000 (+0900) Subject: Revert "(Vector) Add GetLayerInfo method" X-Git-Tag: accepted/tizen/unified/20191113.123451~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=ecf48b6cac3f1ba42fe47bdba44708a13b484326;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Revert "(Vector) Add GetLayerInfo method" This reverts commit 13348d4efbe2f66736fc7e1284e3bfb924b385e4. Change-Id: I303cd2ddde6ee268b55011b1fd67f4f340339d38 --- diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h index a640f3c..6fa992d 100644 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h @@ -94,21 +94,13 @@ public: virtual float GetFrameRate() const = 0; /** - * @brief Gets the default size of the file. + * @brief Gets the default size of the file,. * - * @param[out] width The default width of the file - * @param[out] height The default height of the file + * @return The default size of the file */ virtual void GetDefaultSize( uint32_t& width, uint32_t& height ) const = 0; /** - * @brief Gets the layer information of all the child layers. - * - * @param[out] map The layer information - */ - virtual void GetLayerInfo( Property::Map& map ) const = 0; - - /** * @brief Connect to this signal to be notified when the texture upload is completed. * * @return The signal to connect to. diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp index f55d839..e9fe5e0 100755 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp @@ -89,11 +89,6 @@ void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height GetImplementation( *this ).GetDefaultSize( width, height ); } -void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const -{ - GetImplementation( *this ).GetLayerInfo( map ); -} - VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal() { return GetImplementation( *this ).UploadCompletedSignal(); diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.h b/dali/devel-api/adaptor-framework/vector-animation-renderer.h index 5db1122..0c0a24a 100755 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer.h +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.h @@ -122,20 +122,12 @@ public: float GetFrameRate() const; /** - * @brief Gets the default size of the file. + * @brief Gets the default size of the file,. * - * @param[out] width The default width of the file - * @param[out] height The default height of the file + * @return The default size of the file */ void GetDefaultSize( uint32_t& width, uint32_t& height ) const; - /** - * @brief Gets the layer information of all the child layers. - * - * @param[out] map The layer information - */ - void GetLayerInfo( Property::Map& map ) const; - public: // Signals /** diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp index b1e3a17..885861f 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp +++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp @@ -95,11 +95,6 @@ void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height mPlugin.GetDefaultSize( width, height ); } -void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const -{ - mPlugin.GetLayerInfo( map ); -} - Dali::VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal() { return mPlugin.UploadCompletedSignal(); diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h index 5ede97e..1bc7bac 100755 --- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h +++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h @@ -87,11 +87,6 @@ public: void GetDefaultSize( uint32_t& width, uint32_t& height ) const; /** - * @copydoc Dali::VectorAnimationRenderer::GetLayerInfo() - */ - void GetLayerInfo( Property::Map& map ) const; - - /** * @copydoc Dali::VectorAnimationRenderer::UploadCompletedSignal() */ Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal(); diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp index 009312b..b704c58 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp +++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp @@ -161,14 +161,6 @@ void VectorAnimationRendererPluginProxy::GetDefaultSize( uint32_t& width, uint32 } } -void VectorAnimationRendererPluginProxy::GetLayerInfo( Property::Map& map ) const -{ - if( mPlugin ) - { - mPlugin->GetLayerInfo( map ); - } -} - VectorAnimationRendererPlugin::UploadCompletedSignalType& VectorAnimationRendererPluginProxy::UploadCompletedSignal() { if( mPlugin ) diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h index 17ba06b..2c6267b 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h +++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h @@ -83,11 +83,6 @@ public: void GetDefaultSize( uint32_t& width, uint32_t& height ) const; /** - * @copydoc Dali::VectorAnimationRendererPlugin::GetLayerInfo() - */ - void GetLayerInfo( Property::Map& map ) const; - - /** * @copydoc Dali::VectorAnimationRendererPlugin::UploadCompletedSignal() */ VectorAnimationRendererPlugin::UploadCompletedSignalType& UploadCompletedSignal();