Merge "CanvasRenderer: Add Gradient, LinearGradient, RadialGradient classes" into...

diff --combined dali/internal/canvas-renderer/common/shape-impl.h
index 44ad5c1,f4a0628..4c22519
--- 1/dali/internal/canvas-renderer/common/shape-impl.h
--- 2/dali/internal/canvas-renderer/common/shape-impl.h
+++ b/dali/internal/canvas-renderer/common/shape-impl.h
@@@ -20,8 -20,10 +20,9 @@@
  
  // EXTERNAL INCLUDES
  #include <dali/public-api/object/base-object.h>
 -#include <dali/public-api/signals/connection-tracker.h>
  
  // INTERNAL INCLUDES
+ #include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
  #include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
  #include <dali/internal/canvas-renderer/common/drawable-impl.h>
  
@@@ -98,6 -100,16 +99,16 @@@ public
    virtual Vector4 GetFillColor() const;
  
    /**
+    * @copydoc Dali::CanvasRenderer::Shape::SetFillGradient()
+    */
+   virtual bool SetFillGradient(Dali::CanvasRenderer::Gradient& gradient);
+ 
+   /**
+    * @copydoc Dali::CanvasRenderer::Shape::GetFillGradient()
+    */
+   virtual Dali::CanvasRenderer::Gradient GetFillGradient() const;
+ 
+   /**
     * @copydoc Dali::CanvasRenderer::Shape::SetFillRule()
     */
    virtual bool SetFillRule(Dali::CanvasRenderer::Shape::FillRule rule);
@@@ -128,6 -140,16 +139,16 @@@
    virtual Vector4 GetStrokeColor() const;
  
    /**
+    * @copydoc Dali::CanvasRenderer::Shape::SetStrokeGradient()
+    */
+   virtual bool SetStrokeGradient(Dali::CanvasRenderer::Gradient& gradient);
+ 
+   /**
+    * @copydoc Dali::CanvasRenderer::Shape::GetStrokeGradient()
+    */
+   virtual Dali::CanvasRenderer::Gradient GetStrokeGradient() const;
+ 
+   /**
     * @copydoc Dali::CanvasRenderer::Shape::SetStrokeDash()
     */
    virtual bool SetStrokeDash(const Dali::Vector<float> dashPattern);

diff --combined dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
index 776c857,28026e5..a5c8dc4
--- 1/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
--- 2/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
@@@ -23,6 -23,7 +23,6 @@@
  #include <thorvg.h>
  #endif
  #include <dali/public-api/object/base-object.h>
 -#include <dali/public-api/signals/connection-tracker.h>
  
  // INTERNAL INCLUDES
  #include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
@@@ -97,6 -98,16 +97,16 @@@ public
    Vector4 GetFillColor() const override;
  
    /**
+    * @copydoc Dali::CanvasRenderer::Shape::SetFillGradient()
+    */
+   bool SetFillGradient(Dali::CanvasRenderer::Gradient& gradient) override;
+ 
+   /**
+    * @copydoc Dali::CanvasRenderer::Shape::GetFillGradient()
+    */
+   Dali::CanvasRenderer::Gradient GetFillGradient() const override;
+ 
+   /**
     * @copydoc Dali::CanvasRenderer::Shape::SetFillRule()
     */
    bool SetFillRule(Dali::CanvasRenderer::Shape::FillRule rule) override;
@@@ -127,6 -138,16 +137,16 @@@
    Vector4 GetStrokeColor() const override;
  
    /**
+    * @copydoc Dali::CanvasRenderer::Shape::SetStrokeGradient()
+    */
+   bool SetStrokeGradient(Dali::CanvasRenderer::Gradient& gradient) override;
+ 
+   /**
+    * @copydoc Dali::CanvasRenderer::Shape::GetStrokeGradient()
+    */
+   Dali::CanvasRenderer::Gradient GetStrokeGradient() const override;
+ 
+   /**
     * @copydoc Dali::CanvasRenderer::Shape::SetStrokeDash()
     */
    bool SetStrokeDash(const Dali::Vector<float> dashPattern) override;
@@@ -178,8 -199,10 +198,10 @@@ private
     */
    void Initialize();
  
- #ifdef THORVG_SUPPORT
  private:
+   Dali::CanvasRenderer::Gradient mFillGradient;
+   Dali::CanvasRenderer::Gradient mStrokeGradient;
+ #ifdef THORVG_SUPPORT
    tvg::Shape* mTvgShape;
  #endif
  };

diff --combined dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
index 99f6753,de0be0a..6efe304
--- 1/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
--- 2/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
@@@ -23,6 -23,7 +23,6 @@@
  #include <thorvg.h>
  #endif
  #include <dali/public-api/object/base-object.h>
 -#include <dali/public-api/signals/connection-tracker.h>
  
  // INTERNAL INCLUDES
  #include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
@@@ -97,6 -98,16 +97,16 @@@ public
    Vector4 GetFillColor() const override;
  
    /**
+    * @copydoc Dali::CanvasRenderer::Shape::SetFillGradient()
+    */
+   bool SetFillGradient(Dali::CanvasRenderer::Gradient& gradient) override;
+ 
+   /**
+    * @copydoc Dali::CanvasRenderer::Shape::GetFillGradient()
+    */
+   Dali::CanvasRenderer::Gradient GetFillGradient() const override;
+ 
+   /**
     * @copydoc Dali::CanvasRenderer::Shape::SetFillRule()
     */
    bool SetFillRule(Dali::CanvasRenderer::Shape::FillRule rule) override;
@@@ -127,6 -138,16 +137,16 @@@
    Vector4 GetStrokeColor() const override;
  
    /**
+    * @copydoc Dali::CanvasRenderer::Shape::SetStrokeGradient()
+    */
+   bool SetStrokeGradient(Dali::CanvasRenderer::Gradient& gradient) override;
+ 
+   /**
+    * @copydoc Dali::CanvasRenderer::Shape::GetStrokeGradient()
+    */
+   Dali::CanvasRenderer::Gradient GetStrokeGradient() const override;
+ 
+   /**
     * @copydoc Dali::CanvasRenderer::Shape::SetStrokeDash()
     */
    bool SetStrokeDash(const Dali::Vector<float> dashPattern) override;
@@@ -178,8 -199,10 +198,10 @@@ private
     */
    void Initialize();
  
- #ifdef THORVG_SUPPORT
  private:
+   Dali::CanvasRenderer::Gradient mFillGradient;
+   Dali::CanvasRenderer::Gradient mStrokeGradient;
+ #ifdef THORVG_SUPPORT
    tvg::Shape* mTvgShape;
  #endif
  };