Merge "Moved TextureSet::SetImage() to separate devel-api module" into devel/master

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

diff --git a/dali-toolkit/internal/controls/renderers/color/color-renderer.h b/dali-toolkit/internal/controls/renderers/color/color-renderer.h
index 82071b5..d5c7a94 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/color/color-renderer.h
+++ b/dali-toolkit/internal/controls/renderers/color/color-renderer.h
@@ -35,9 +35,9 @@ namespace Internal
  *
  * The following properties are required for create a ColorRender
  *
- * | %Property Name   | Type        |
- * |------------------|-------------|
- * | blend-color      | VECTOR4     |
+ * | %Property Name  | Type        |
+ * |-----------------|-------------|
+ * | mixColor        | VECTOR4     |
  */
 class ColorRenderer: public ControlRenderer
 {
@@ -82,12 +82,12 @@ protected:
   /**
    * @copydoc ControlRenderer::DoInitialize
    */
-  virtual void DoInitialize( const Property::Map& propertyMap );
+  virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
 
   /**
-   * @copydoc ControlRenderer::InitializeRenderer
+   * @copydoc ControlRenderer::DoSetOnStage
    */
-  virtual void InitializeRenderer( Renderer& renderer );
+  virtual void DoSetOnStage( Actor& actor );
 
 public:
 
@@ -98,6 +98,12 @@ public:
   void SetColor( const Vector4& color );
 
 private:
+  /**
+   * @brief Initialize the renderer with the geometry and shader from the cache, if not available, create and save to the cache for sharing.
+   */
+  void InitializeRenderer();
+
+private:
 
   // Undefined
   ColorRenderer( const ColorRenderer& colorRenderer );
@@ -107,8 +113,8 @@ private:
 
 private:
 
-  Vector4 mBlendColor;
-  Property::Index mBlendColorIndex;
+  Vector4 mMixColor;
+  Property::Index mMixColorIndex;
 
 };