Merge "Fixed bug when delete first row in the tableView" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / renderers / renderer-factory-impl.h

diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
index 4ed7e7f..fed299a 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
+++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.h
@@ -52,7 +52,12 @@ public:
   /**
    * @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 +65,9 @@ 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& )
    */
-  bool ResetRenderer( Toolkit::ControlRenderer& renderer, const Vector4& color );
+  void ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Vector4& color );
 
   /**
    * @copydoc Toolkit::RenderFactory::GetControlRenderer( float, const Vector4& )
@@ -75,9 +80,9 @@ 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& )
@@ -85,9 +90,15 @@ public:
   Toolkit::ControlRenderer GetControlRenderer( const std::string& image );
 
   /**
-   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, const std::string& )
+   * @copydoc Toolkit::RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, Actor& actor, const std::string& )
+   */
+  void ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const std::string& image );
+
+public:
+  /**
+   * @brief Returns an image to be used when a renderer has failed to correctly render
    */
-  bool ResetRenderer( Toolkit::ControlRenderer& renderer, const std::string& image );
+  static Image GetBrokenRendererImage();
 
 protected: