X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-vector-animation-renderer.cpp;h=b0075d2e965eaaa44dc126b50251e048d6ab7db7;hp=f8c0c365d47c407569e6da8301902a3bb4b0a2a9;hb=268f651469300b3950b3f314fa33803b6c24273e;hpb=7e184105f63836152d054c939bd0cb73f8dcc07a

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..b0075d2 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
@@ -18,6 +18,9 @@
 #include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
 #include <dali/public-api/object/base-object.h>
 #include <toolkit-application.h>
+#include <toolkit-vector-animation-renderer.h>
+#include <toolkit-event-thread-callback.h>
+#include <memory>
 
 namespace Dali
 {
@@ -38,7 +41,8 @@ public:
     mWidth( 0 ),
     mHeight( 0 ),
     mPreviousFrame( 0 ),
-    mFrameRate( 60.0f )
+    mFrameRate( 60.0f ),
+    mEventThreadCallback( new EventThreadCallback( MakeCallback( this, &VectorAnimationRenderer::OnTriggered ) ) )
   {
     mCount++;
 
@@ -82,6 +86,12 @@ public:
 
   bool Render( uint32_t frameNumber )
   {
+    if( mNeedTrigger )
+    {
+      mEventThreadCallback->Trigger();
+      mNeedTrigger = false;
+    }
+
     if( frameNumber == 1 && mPreviousFrame != frameNumber )
     {
       mPreviousFrame = frameNumber;
@@ -94,7 +104,7 @@ public:
 
   uint32_t GetTotalFrameNumber() const
   {
-    return 5;
+    return VECTOR_ANIMATION_TOTAL_FRAME_NUMBER;
   }
 
   float GetFrameRate() const
@@ -108,8 +118,23 @@ public:
     height = 100;
   }
 
-  void GetLayerInfo( Property::Map& map ) const
+  bool GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
   {
+    if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_1 ) == 0 )
+    {
+      startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_1;
+      endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_1;
+    }
+    else if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_2 ) == 0 )
+    {
+      startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_2;
+      endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_2;
+    }
+    else
+    {
+      return false;
+    }
+    return true;
   }
 
   Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal()
@@ -117,9 +142,14 @@ public:
     return mUploadCompletedSignal;
   }
 
+  void OnTriggered()
+  {
+  }
+
 public:
 
   static uint32_t mCount;
+  static bool mNeedTrigger;
 
   std::string mUrl;
   Dali::Renderer mRenderer;
@@ -128,9 +158,11 @@ public:
   uint32_t mPreviousFrame;
   float mFrameRate;
   Dali::VectorAnimationRenderer::UploadCompletedSignalType mUploadCompletedSignal;
+  std::unique_ptr< EventThreadCallback > mEventThreadCallback;
 };
 
 uint32_t VectorAnimationRenderer::mCount = 0;
+bool VectorAnimationRenderer::mNeedTrigger = true;
 
 inline VectorAnimationRenderer& GetImplementation( Dali::VectorAnimationRenderer& renderer )
 {
@@ -186,6 +218,10 @@ VectorAnimationRenderer& VectorAnimationRenderer::operator=( const VectorAnimati
   return *this;
 }
 
+void VectorAnimationRenderer::Finalize()
+{
+}
+
 void VectorAnimationRenderer::SetRenderer( Renderer renderer )
 {
   Internal::Adaptor::GetImplementation( *this ).SetRenderer( renderer );
@@ -218,7 +254,11 @@ void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height
 
 void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const
 {
-  Internal::Adaptor::GetImplementation( *this ).GetLayerInfo( map );
+}
+
+bool VectorAnimationRenderer::GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+{
+  return Internal::Adaptor::GetImplementation( *this ).GetMarkerInfo( marker, startFrame, endFrame );
 }
 
 VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal()
@@ -226,5 +266,18 @@ VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::Upl
   return Internal::Adaptor::GetImplementation( *this ).UploadCompletedSignal();
 }
 
-} // namespace Dali;
+} // namespace Dali
+
+namespace Test
+{
+namespace VectorAnimationRenderer
+{
+
+void RequestTrigger()
+{
+  Dali::Internal::Adaptor::VectorAnimationRenderer::mNeedTrigger = true;
+}
+
+} // VectorAnimationRenderer
+} // Test