From f7479bc0da79f720c88520b78cceda538786b2f3 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 12 Nov 2019 15:51:48 +0900 Subject: [PATCH] Revert "(Vector) Add CONTENT_INFO property" This reverts commit 6c294470fb58f16fe4b994f217ece6b60b402234. --- .../toolkit-vector-animation-renderer.cpp | 9 --------- .../src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp | 3 --- .../devel-api/visuals/image-visual-properties-devel.h | 11 +---------- .../animated-vector-image/animated-vector-image-visual.cpp | 4 ---- .../visuals/animated-vector-image/vector-animation-task.cpp | 5 ----- .../visuals/animated-vector-image/vector-animation-task.h | 6 ------ 6 files changed, 1 insertion(+), 37 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp index f8c0c36..344280a 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp @@ -108,10 +108,6 @@ public: height = 100; } - void GetLayerInfo( Property::Map& map ) const - { - } - Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal() { return mUploadCompletedSignal; @@ -216,11 +212,6 @@ void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height Internal::Adaptor::GetImplementation( *this ).GetDefaultSize( width, height ); } -void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const -{ - Internal::Adaptor::GetImplementation( *this ).GetLayerInfo( map ); -} - VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal() { return Internal::Adaptor::GetImplementation( *this ).UploadCompletedSignal(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp index 096b960..794a0cd 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp @@ -297,9 +297,6 @@ int UtcDaliAnimatedVectorImageVisualGetPropertyMap01(void) DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::LoopingMode::RESTART ); - value = resultMap.Find( DevelImageVisual::Property::CONTENT_INFO, Property::MAP ); - DALI_TEST_CHECK( value ); - // request AnimatedVectorImageVisual with an URL Visual::Base visual2 = factory.CreateVisual( TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions() ); diff --git a/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h b/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h index 1c54511..306880b 100644 --- a/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h +++ b/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h @@ -128,16 +128,7 @@ enum Type * @details Name "loopingMode", Type LoopingMode::Type (Property::INTEGER) * @note Default value is LoopingMode::RESTART. */ - LOOPING_MODE = ORIENTATION_CORRECTION + 9, - - /** - * @brief The content information the AnimatedVectorImageVisual will use. - * @details Name "contentInfo", Type Property::MAP. - * The map contains the layer name as a key and Property::Array as a value. - * And the array contains 2 integer values which are the frame numbers, the start frame number and the end frame number of the layer. - * @note This property is read-only. - */ - CONTENT_INFO = ORIENTATION_CORRECTION + 10 + LOOPING_MODE = ORIENTATION_CORRECTION + 9 }; } //namespace Property diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp index 16203e7..de415df 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp @@ -161,10 +161,6 @@ void AnimatedVectorImageVisual::DoCreatePropertyMap( Property::Map& map ) const map.Insert( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, mStopBehavior ); map.Insert( Toolkit::DevelImageVisual::Property::LOOPING_MODE, mLoopingMode ); - - Property::Map layerInfo; - mVectorAnimationTask->GetLayerInfo( layerInfo ); - map.Insert( Toolkit::DevelImageVisual::Property::CONTENT_INFO, layerInfo ); } void AnimatedVectorImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp index 7af08ac..0445df7 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp @@ -317,11 +317,6 @@ void VectorAnimationTask::SetLoopingMode( DevelImageVisual::LoopingMode::Type lo DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetLoopingMode: looping mode = %d [%p]\n", mLoopingMode, this ); } -void VectorAnimationTask::GetLayerInfo( Property::Map& map ) const -{ - mVectorRenderer.GetLayerInfo( map ); -} - VectorAnimationTask::UploadCompletedSignalType& VectorAnimationTask::UploadCompletedSignal() { return mVectorRenderer.UploadCompletedSignal(); diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h index 4f6f83a..c13b4d3 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h @@ -169,12 +169,6 @@ public: void SetLoopingMode( DevelImageVisual::LoopingMode::Type loopingMode ); /** - * @brief Gets the layer information of all the child layers. - * @param[out] map The layer information - */ - void GetLayerInfo( Property::Map& map ) const; - - /** * @brief Connect to this signal to be notified when the texture upload is completed. * @return The signal to connect to. */ -- 2.7.4