X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Frenderer-factory-impl.h;h=e129aef404adfcf24ac178dc7884bb5bbb17a557;hb=6084b902e588a8ed1b8ec0dd7aacae8775006ef6;hp=d65e747c307cfbfaae7b1ccddd7e40a53fbdf7cd;hpb=018b3b5ba7512694a9b95494493f2ae0477f2746;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 d65e747..e129aef 100644
--- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
+++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
@@ -36,6 +36,9 @@ namespace Internal
 class RendererFactoryCache;
 typedef IntrusivePtr<RendererFactoryCache> RendererFactoryCachePtr;
 
+class ImageAtlasManager;
+typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
+
 /**
  * @copydoc Toolkit::RendererFactory
  */
@@ -46,13 +49,20 @@ public:
 
   /**
    * @brief Constructor
+   *
+   * @param[in] debugEnabled If true, use debug renderer to replace all the concrete renderer.
    */
-  RendererFactory();
+  RendererFactory( bool debugEnabled );
 
   /**
    * @copydoc Toolkit::RenderFactory::GetControlRenderer( const Property::Map& )
    */
-  Toolkit::ControlRenderer GetControlRenderer( const Property::Map& propertyMap  );
+  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& )
@@ -60,9 +70,14 @@ public:
   Toolkit::ControlRenderer GetControlRenderer( const Vector4& color );
 
   /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, const Vector4& )
+   * @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&, bool )
    */
-  bool ResetRenderer( Toolkit::ControlRenderer& renderer, const Vector4& color );
+  Toolkit::ControlRenderer GetControlRenderer( float borderSize, const Vector4& borderColor, bool antiAliasing );
 
   /**
    * @copydoc Toolkit::RenderFactory::GetControlRenderer( const Image& )
@@ -70,19 +85,25 @@ public:
   Toolkit::ControlRenderer GetControlRenderer( const Image& image );
 
   /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, const Image& )
+   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, Actor& actor, const Image& )
    */
-  bool ResetRenderer( Toolkit::ControlRenderer& renderer, const Image& image );
+  void ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Image& image );
 
   /**
-   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const std::string& )
+   * @copydoc Toolkit::RenderFactory::GetControlRenderer( const std::string&, ImageDimensions )
    */
-  Toolkit::ControlRenderer GetControlRenderer( const std::string& image );
+  Toolkit::ControlRenderer GetControlRenderer( const std::string& image, ImageDimensions size );
 
   /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, const std::string& )
+   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, Actor& actor, const std::string&, ImageDimensions )
    */
-  bool ResetRenderer( Toolkit::ControlRenderer& renderer, const std::string& image );
+  void ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const std::string& image, ImageDimensions size );
+
+public:
+  /**
+   * @brief Returns an image to be used when a renderer has failed to correctly render
+   */
+  static Image GetBrokenRendererImage();
 
 protected:
 
@@ -94,6 +115,11 @@ protected:
 private:
 
   /**
+   * Prepare the atlas manager
+   */
+  void CreateAtlasManager();
+
+  /**
    * Undefined copy constructor.
    */
   RendererFactory(const RendererFactory&);
@@ -106,6 +132,8 @@ private:
 private:
 
   RendererFactoryCachePtr mFactoryCache;
+  ImageAtlasManagerPtr    mAtlasManager;
+  bool                    mDebugEnabled;
 };
 
 } // namespace Internal