Revert "(Vector) Refactor vector to use thread pool"

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / animated-vector-image / animated-vector-image-visual.h

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
index 78848d0..b6837b5 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
@@ -22,13 +22,12 @@
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/object/weak-handle.h>
 #include <dali/public-api/object/property-notification.h>
-#include <dali/devel-api/actors/actor-devel.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 #include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h>
-#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h>
+#include <dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h>
 
 namespace Dali
 {
@@ -40,6 +39,7 @@ namespace Internal
 {
 
 class ImageVisualShaderFactory;
+class VectorRasterizeThread;
 class AnimatedVectorImageVisual;
 using AnimatedVectorImageVisualPtr = IntrusivePtr< AnimatedVectorImageVisual >;
 
@@ -176,11 +176,6 @@ private:
    */
   void OnSizeNotification( PropertyNotification& source );
 
-  /**
-   * @brief Callback when the visibility of the actor is changed.
-   */
-  void OnVisibilityChanged( Actor actor, bool visible, DevelActor::VisibilityChange::Type type );
-
   // Undefined
   AnimatedVectorImageVisual( const AnimatedVectorImageVisual& visual ) = delete;
 
@@ -188,17 +183,17 @@ private:
   AnimatedVectorImageVisual& operator=( const AnimatedVectorImageVisual& visual ) = delete;
 
 private:
-  VisualUrl                                    mUrl;
-  VectorAnimationTaskPtr                       mVectorAnimationTask;
   ImageVisualShaderFactory&                    mImageVisualShaderFactory;
+  VisualUrl                                    mUrl;
+  VectorRasterizeThread                        mVectorRasterizeThread;
   PropertyNotification                         mScaleNotification;
   PropertyNotification                         mSizeNotification;
   Vector2                                      mVisualSize;
   Vector2                                      mVisualScale;
   WeakHandle< Actor >                          mPlacementActor;
   int32_t                                      mLoopCount;
-  uint32_t                                     mStartFrame;
-  uint32_t                                     mEndFrame;
+  int32_t                                      mStartFrame;
+  int32_t                                      mEndFrame;
   uint32_t                                     mResendFlag;
   DevelAnimatedVectorImageVisual::Action::Type mActionStatus;
   DevelImageVisual::StopBehavior::Type         mStopBehavior;