Fixed issues with resolving URL type

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

diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h
index d674d2f..c583035 100644 (file)
--- a/dali-toolkit/internal/visuals/svg/svg-visual.h
+++ b/dali-toolkit/internal/visuals/svg/svg-visual.h
@@ -19,8 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-impl.h>
-#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
 
 struct NSVGimage;
 
@@ -34,7 +33,7 @@ namespace Internal
 {
 
 /**
- * The renderer which renders a svg image
+ * The visual which renders a svg image
  *
  * The following property is essential
  *
@@ -43,7 +42,7 @@ namespace Internal
  * | url                      | STRING           |
  *
  */
-class SvgVisual: public Visual
+class SvgVisual: public Visual::Base
 {
 public:
 
@@ -52,7 +51,7 @@ public:
    *
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    */
-  SvgVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlasManager );
+  SvgVisual( VisualFactoryCache& factoryCache );
 
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
@@ -96,16 +95,8 @@ protected:
 public:
 
   /**
-   * @brief Helper method to determine whether the url indicate that it is a svg image.
-   *
-   * @param [in] url The URL of the image file.
-   * @return true if it is a svg image
-   */
-  static bool IsSvgUrl( const std::string& url );
-
-  /**
-   * @brief Sets the svg image of this renderer to the resource at imageUrl
-   * The renderer will parse the svg image once it is set.
+   * @brief Sets the svg image of this visual to the resource at imageUrl
+   * The visual will parse the svg image once it is set.
    * And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage
    *
    * @param[in] imageUrl The URL to svg resource to use
@@ -113,7 +104,7 @@ public:
   void SetImage( const std::string& imageUrl, ImageDimensions size = ImageDimensions() );
 
   /**
-   * @bried Apply the rasterized image to the renderer.
+   * @bried Apply the rasterized image to the visual.
    *
    * @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels
    */
@@ -121,7 +112,7 @@ public:
 
 private:
   /**
-   * @bried Rasterize the svg with the given size, and add it to the renderer.
+   * @bried Rasterize the svg with the given size, and add it to the visual.
    *
    * @param[in] size The target size of the SVG rasterization.
    */
@@ -136,7 +127,6 @@ private:
 
 private:
   Vector4              mAtlasRect;
-  ImageAtlasManager&   mAtlasManager;
   std::string          mImageUrl;
   NSVGimage*           mParsedImage;