(Vector) Change event processing

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / visual-factory-cache.h

diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.h b/dali-toolkit/internal/visuals/visual-factory-cache.h
index f1822c1..5fab354 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.h
@@ -28,11 +28,10 @@
 #include <dali-toolkit/internal/visuals/npatch-loader.h>
 #include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
 #include <dali-toolkit/internal/visuals/texture-manager-impl.h>
-#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h>
 
 namespace Dali
 {
-class Image;
+class Texture;
 
 namespace Toolkit
 {
@@ -42,6 +41,7 @@ namespace Internal
 class ImageAtlasManager;
 class NPatchLoader;
 class TextureManager;
+class VectorAnimationManager;
 
 typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
 
@@ -168,10 +168,10 @@ public:
   static Geometry CreateGridGeometry( Uint16Pair gridSize );
 
   /**
-   * @brief Returns an image to be used when a visual has failed to correctly render
-   * @return The broken image handle.
+   * @brief Returns a new Texture to use when a visual has failed to correctly render
+   * @return The broken image texture.
    */
-  Image GetBrokenVisualImage();
+  Texture GetBrokenVisualImage();
 
   /**
    * @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
@@ -215,10 +215,10 @@ public:
   SvgRasterizeThread* GetSVGRasterizationThread();
 
   /**
-   * Get the vector animation thread.
-   * @return A raw pointer pointing to the vector animation thread.
+   * Get the vector animation manager.
+   * @return A reference to the vector animation manager.
    */
-  VectorAnimationThread& GetVectorAnimationThread();
+  VectorAnimationManager& GetVectorAnimationManager();
 
 private: // for svg rasterization thread
 
@@ -243,13 +243,14 @@ private:
   Geometry mGeometry[GEOMETRY_TYPE_MAX+1];
   Shader mShader[SHADER_TYPE_MAX+1];
 
-  ImageAtlasManagerPtr                     mAtlasManager;
-  TextureManager                           mTextureManager;
-  NPatchLoader                             mNPatchLoader;
-  SvgRasterizeThread*                      mSvgRasterizeThread;
-  std::unique_ptr< VectorAnimationThread > mVectorAnimationThread;
-  std::string                              mBrokenImageUrl;
-  bool                                     mPreMultiplyOnLoad;
+  ImageAtlasManagerPtr                      mAtlasManager;
+  TextureManager                            mTextureManager;
+  NPatchLoader                              mNPatchLoader;
+  Texture                                   mBrokenImageTexture;
+  SvgRasterizeThread*                       mSvgRasterizeThread;
+  std::unique_ptr< VectorAnimationManager > mVectorAnimationManager;
+  std::string                               mBrokenImageUrl;
+  bool                                      mPreMultiplyOnLoad;
 };
 
 } // namespace Internal