[dali_1.4.42] Merge branch 'devel/master'

[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 bb4744c..e080d52 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.h
@@ -28,6 +28,7 @@
 #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
 {
@@ -68,7 +69,6 @@ public:
     IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
     NINE_PATCH_SHADER,
     NINE_PATCH_MASK_SHADER,
-    SVG_SHADER,
     TEXT_SHADER_MULTI_COLOR_TEXT,
     TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
     TEXT_SHADER_SINGLE_COLOR_TEXT,
@@ -161,7 +161,7 @@ public:
    * @brief Returns an image to be used when a visual has failed to correctly render
    * @return The broken image handle.
    */
-  static Image GetBrokenVisualImage();
+  Image GetBrokenVisualImage();
 
   /**
    * @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
@@ -173,6 +173,12 @@ public:
    */
   bool GetPreMultiplyOnLoad();
 
+  /**
+   * @brief Set an image to be used when a visual has failed to correctly render
+   * @param[in] brokenImageUrl The broken image url.
+   */
+  void SetBrokenImageUrl(const std::string& brokenImageUrl);
+
 public:
   /**
    * Get the image atlas manager.
@@ -198,6 +204,12 @@ public:
    */
   SvgRasterizeThread* GetSVGRasterizationThread();
 
+  /**
+   * Get the vector animation thread.
+   * @return A raw pointer pointing to the vector animation thread.
+   */
+  VectorAnimationThread& GetVectorAnimationThread();
+
 private: // for svg rasterization thread
 
   /**
@@ -221,11 +233,13 @@ private:
   Geometry mGeometry[GEOMETRY_TYPE_MAX+1];
   Shader mShader[SHADER_TYPE_MAX+1];
 
-  ImageAtlasManagerPtr mAtlasManager;
-  TextureManager       mTextureManager;
-  NPatchLoader         mNPatchLoader;
-  SvgRasterizeThread*  mSvgRasterizeThread;
-  bool                 mPreMultiplyOnLoad;
+  ImageAtlasManagerPtr                     mAtlasManager;
+  TextureManager                           mTextureManager;
+  NPatchLoader                             mNPatchLoader;
+  SvgRasterizeThread*                      mSvgRasterizeThread;
+  std::unique_ptr< VectorAnimationThread > mVectorAnimationThread;
+  std::string                              mBrokenImageUrl;
+  bool                                     mPreMultiplyOnLoad;
 };
 
 } // namespace Internal