X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Frenderer-factory-impl.h;h=671c752e42a1fb491551cc756ade53f2ff380a8f;hb=refs%2Fchanges%2F16%2F75316%2F15;hp=033b904b00b9e12f2c876a3d41ced333e09ca17f;hpb=46fe497b39cfdec35dade509903cde6f4d7f7e89;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
index 033b904..671c752 100644
--- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
+++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
@@ -44,9 +44,20 @@ typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
  */
 class RendererFactory : public BaseObject
 {
-
 public:
 
+  enum RendererType
+  {
+    COLOR,
+    BORDER,
+    GRADIENT,
+    IMAGE,
+    N_PATCH,
+    SVG,
+    MESH,
+    UNDEFINED
+  };
+
   /**
    * @brief Constructor
    *
@@ -55,49 +66,19 @@ public:
   RendererFactory( bool debugEnabled );
 
   /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const Property::Map& )
-   */
-  Toolkit::ControlRenderer GetControlRenderer( const Property::Map& propertyMap );
-
-  /**
-   * @copydoc Toolkit::RenderFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Property::Map& propertyMap )
-   */
-  void ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Property::Map& propertyMap );
-
-  /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const Vector4& )
-   */
-  Toolkit::ControlRenderer GetControlRenderer( const Vector4& color );
-
-  /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, Actor& actor, const Vector4& )
-   */
-  void ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Vector4& color );
-
-  /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( float, const Vector4& )
-   */
-  Toolkit::ControlRenderer GetControlRenderer( float borderSize, const Vector4& borderColor );
-
-  /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const Image& )
-   */
-  Toolkit::ControlRenderer GetControlRenderer( const Image& image );
-
-  /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, Actor& actor, const Image& )
+   * @copydoc Toolkit::RenderFactory::CreateControlRenderer( const Property::Map& )
    */
-  void ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Image& image );
+  Toolkit::ControlRenderer CreateControlRenderer( const Property::Map& propertyMap );
 
   /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const std::string&, ImageDimensions )
+   * @copydoc Toolkit::RenderFactory::CreateControlRenderer( const Image& )
    */
-  Toolkit::ControlRenderer GetControlRenderer( const std::string& image, ImageDimensions size );
+  Toolkit::ControlRenderer CreateControlRenderer( const Image& image );
 
   /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, Actor& actor, const std::string&, ImageDimensions )
+   * @copydoc Toolkit::RenderFactory::CreateControlRenderer( const std::string&, ImageDimensions )
    */
-  void ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const std::string& image, ImageDimensions size );
+  Toolkit::ControlRenderer CreateControlRenderer( const std::string& image, ImageDimensions size );
 
 public:
   /**
@@ -115,6 +96,14 @@ protected:
 private:
 
   /**
+   * Get the renderer type from the property map.
+   *
+   * @param[in] propertyMap The map contains the properties of the control renderer
+   * @return The rendererType
+   */
+  RendererType GetRendererType( const Property::Map& propertyMap );
+
+  /**
    * Prepare the atlas manager
    */
   void CreateAtlasManager();