From 7b9ee1662abec72bc1c62e948a2a57f76010853b Mon Sep 17 00:00:00 2001 From: Wonsik Jung Date: Thu, 19 Dec 2019 11:28:11 +0900 Subject: [PATCH] Revert "[Tizen] (Vector) Increase KeepRendering duration" This reverts commit d1df5e4b286d364d1994ed3b85759c6183486935. --- .../visuals/animated-vector-image/animated-vector-image-visual.cpp | 6 +++--- .../visuals/animated-vector-image/vector-animation-task.cpp | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) 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 3e8378b..122d407 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 @@ -437,7 +437,7 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING ) { mVectorAnimationTask->RenderFrame(); - Stage::GetCurrent().KeepRendering( 1.0f ); // Trigger rendering + Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger rendering } } break; @@ -531,7 +531,7 @@ void AnimatedVectorImageVisual::SendAnimationData() else { mVectorAnimationTask->RenderFrame(); - Stage::GetCurrent().KeepRendering( 1.0f ); + Stage::GetCurrent().KeepRendering( 0.0f ); } } @@ -549,7 +549,7 @@ void AnimatedVectorImageVisual::SetVectorImageSize() if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING ) { mVectorAnimationTask->RenderFrame(); - Stage::GetCurrent().KeepRendering( 1.0f ); // Trigger rendering + Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger rendering } } 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 379ebc5..8258fb7 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 @@ -94,8 +94,6 @@ VectorAnimationTask::~VectorAnimationTask() void VectorAnimationTask::Finalize() { - ConditionalWait::ScopedLock lock( mConditionalWait ); - // Release some objects in the main thread if( mAnimationFinishedTrigger ) { -- 2.7.4