X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Frenderer-factory-impl.h;h=57f5f597af1af56bc5dfb258966bb0aa12fa3f06;hb=d00a250741411c386d988e7ac34525cf94a1918e;hp=a76c57270536f1a0b0d4946aa3b5bb38eba8d3cb;hpb=db3fc9592ec6897e668a62afa7ffdff3ad82c023;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 a76c572..57f5f59 100644
--- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
+++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
@@ -36,63 +36,50 @@ namespace Internal
 class RendererFactoryCache;
 typedef IntrusivePtr<RendererFactoryCache> RendererFactoryCachePtr;
 
+class ImageAtlasManager;
+typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
+
 /**
  * @copydoc Toolkit::RendererFactory
  */
 class RendererFactory : public BaseObject
 {
-
 public:
 
-  /**
-   * @brief Constructor
-   */
-  RendererFactory();
-
-  /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const Property::Map& )
-   */
-  Toolkit::ControlRenderer GetControlRenderer( const Property::Map& propertyMap );
-
-  /**
-   * @copydoc Toolkit::RenderFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, const Property::Map& propertyMap )
-   */
-  bool ResetRenderer( Toolkit::ControlRenderer& renderer, const Property::Map& propertyMap );
-
-  /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const Vector4& )
-   */
-  Toolkit::ControlRenderer GetControlRenderer( const Vector4& color );
+  enum RendererType
+  {
+    COLOR,
+    BORDER,
+    GRADIENT,
+    IMAGE,
+    N_PATCH,
+    SVG,
+    MESH,
+    PRIMITIVE,
+    UNDEFINED
+  };
 
   /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, const Vector4& )
-   */
-  bool ResetRenderer( Toolkit::ControlRenderer& renderer, const Vector4& color );
-
-  /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( float, const Vector4& )
-   */
-  Toolkit::ControlRenderer GetControlRenderer( float borderSize, const Vector4& borderColor );
-
-  /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const Image& )
+   * @brief Constructor
+   *
+   * @param[in] debugEnabled If true, use debug renderer to replace all the concrete renderer.
    */
-  Toolkit::ControlRenderer GetControlRenderer( const Image& image );
+  RendererFactory( bool debugEnabled );
 
   /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, const Image& )
+   * @copydoc Toolkit::RenderFactory::CreateControlRenderer( const Property::Map& )
    */
-  bool ResetRenderer( Toolkit::ControlRenderer& renderer, const Image& image );
+  Toolkit::ControlRenderer CreateControlRenderer( const Property::Map& propertyMap );
 
   /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const std::string& )
+   * @copydoc Toolkit::RenderFactory::CreateControlRenderer( const Image& )
    */
-  Toolkit::ControlRenderer GetControlRenderer( const std::string& image );
+  Toolkit::ControlRenderer CreateControlRenderer( const Image& image );
 
   /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, const std::string& )
+   * @copydoc Toolkit::RenderFactory::CreateControlRenderer( const std::string&, ImageDimensions )
    */
-  bool ResetRenderer( Toolkit::ControlRenderer& renderer, const std::string& image );
+  Toolkit::ControlRenderer CreateControlRenderer( const std::string& image, ImageDimensions size );
 
 public:
   /**
@@ -110,6 +97,19 @@ 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();
+
+  /**
    * Undefined copy constructor.
    */
   RendererFactory(const RendererFactory&);
@@ -122,6 +122,8 @@ private:
 private:
 
   RendererFactoryCachePtr mFactoryCache;
+  ImageAtlasManagerPtr    mAtlasManager;
+  bool                    mDebugEnabled;
 };
 
 } // namespace Internal