From: Heeyong Song <heeyong.song@samsung.com>
Date: Wed, 20 Nov 2019 08:41:03 +0000 (+0900)
Subject: [Tizen] (Vector) Increase KeepRendering duration
X-Git-Tag: accepted/tizen/unified/20191121.073413~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=b3cdf204a75ee4bbd56d5a0fc23de475acf76e9d

[Tizen] (Vector) Increase KeepRendering duration

Change-Id: I2ee66cb115444a7b677b06f85cc2f94aa43ff217
---

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 122d407..3e8378b 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( 0.0f );    // Trigger rendering
+          Stage::GetCurrent().KeepRendering( 1.0f );    // Trigger rendering
         }
       }
       break;
@@ -531,7 +531,7 @@ void AnimatedVectorImageVisual::SendAnimationData()
       else
       {
         mVectorAnimationTask->RenderFrame();
-        Stage::GetCurrent().KeepRendering( 0.0f );
+        Stage::GetCurrent().KeepRendering( 1.0f );
       }
     }
 
@@ -549,7 +549,7 @@ void AnimatedVectorImageVisual::SetVectorImageSize()
   if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING )
   {
     mVectorAnimationTask->RenderFrame();
-    Stage::GetCurrent().KeepRendering( 0.0f );    // Trigger rendering
+    Stage::GetCurrent().KeepRendering( 1.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 ac89867..2579229 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,6 +94,8 @@ VectorAnimationTask::~VectorAnimationTask()
 
 void VectorAnimationTask::Finalize()
 {
+  ConditionalWait::ScopedLock lock( mConditionalWait );
+
   // Release some objects in the main thread
   if( mAnimationFinishedTrigger )
   {