[Tizen] (Vector) Increase KeepRendering duration

This reverts commit 60aa6a614a68d0e43e9642e14986b4b6cfc24472.

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 (file)
--- 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 8258fb7..379ebc5 100644 (file)
--- 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 )
   {