From: Wonsik Jung Date: Thu, 19 Dec 2019 06:20:08 +0000 (+0900) Subject: Revert "[Tizen] (Vector) Increase KeepRendering duration" X-Git-Tag: submit/tizen/20191219.065232~4 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=100b37c714cff1396200044560fb618334d70cbd;hp=ad8df8e42438466cd737d0315fa0365a836860e3 Revert "[Tizen] (Vector) Increase KeepRendering duration" This reverts commit ff2ab547629bc83e611cb843d7d0c72135de8b39. --- 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 ) {