X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fcanvas-renderer%2Fcommon%2Fshape-impl.h;h=4c22519b88c9e9d230f6f34e288eab27015d52d4;hb=c3919280109f57ddc461a4ce36950308d0fc3c12;hp=e5b485dc553c014eeedd33f1db7afa7d0f350ff6;hpb=d5aaf2ca7cb8f09d1a63d8eacf7c3cc5f732519e;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/canvas-renderer/common/shape-impl.h b/dali/internal/canvas-renderer/common/shape-impl.h
index e5b485d..4c22519 100644
--- a/dali/internal/canvas-renderer/common/shape-impl.h
+++ b/dali/internal/canvas-renderer/common/shape-impl.h
@@ -19,13 +19,10 @@
  */
 
 // EXTERNAL INCLUDES
-#ifdef THORVG_SUPPORT
-#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-gradient.h>
 #include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
 #include <dali/internal/canvas-renderer/common/drawable-impl.h>
 
@@ -52,107 +49,132 @@ public:
   ~Shape() override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::AddRect
+   * @copydoc Dali::CanvasRenderer::Shape::AddRect()
    */
   virtual bool AddRect(Rect<float> rect, Vector2 roundedCorner);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::AddCircle
+   * @copydoc Dali::CanvasRenderer::Shape::AddCircle()
    */
   virtual bool AddCircle(Vector2 center, Vector2 radius);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::AddArc
+   * @copydoc Dali::CanvasRenderer::Shape::AddArc()
    */
   virtual bool AddArc(Vector2 center, float radius, float startAngle, float sweep, bool pie);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::AddMoveTo
+   * @copydoc Dali::CanvasRenderer::Shape::AddMoveTo()
    */
   virtual bool AddMoveTo(Vector2 point);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::AddLineTo
+   * @copydoc Dali::CanvasRenderer::Shape::AddLineTo()
    */
   virtual bool AddLineTo(Vector2 line);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::AddCubicTo
+   * @copydoc Dali::CanvasRenderer::Shape::AddCubicTo()
    */
   virtual bool AddCubicTo(Vector2 controlPoint1, Vector2 controlPoint2, Vector2 endPoint);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::AddClose
+   * @copydoc Dali::CanvasRenderer::Shape::Close()
    */
   virtual bool Close();
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::SetFillColor
+   * @copydoc Dali::CanvasRenderer::Shape::ResetPath()
+   */
+  virtual bool ResetPath();
+
+  /**
+   * @copydoc Dali::CanvasRenderer::Shape::SetFillColor()
    */
   virtual bool SetFillColor(Vector4 color);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::GetFillColor
+   * @copydoc Dali::CanvasRenderer::Shape::GetFillColor()
    */
   virtual Vector4 GetFillColor() const;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::SetFillRule
+   * @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);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::GetFillRule
+   * @copydoc Dali::CanvasRenderer::Shape::GetFillRule()
    */
   virtual Dali::CanvasRenderer::Shape::FillRule GetFillRule() const;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::SetStrokeWidth
+   * @copydoc Dali::CanvasRenderer::Shape::SetStrokeWidth()
    */
   virtual bool SetStrokeWidth(float width);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeWidth
+   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeWidth()
    */
   virtual float GetStrokeWidth() const;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::SetStrokeColor
+   * @copydoc Dali::CanvasRenderer::Shape::SetStrokeColor()
    */
   virtual bool SetStrokeColor(Vector4 color);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeColor
+   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeColor()
    */
   virtual Vector4 GetStrokeColor() const;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::SetStrokeDash
+   * @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);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeDash
+   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeDash()
    */
   virtual Dali::Vector<float> GetStrokeDash() const;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::SetStrokeCap
+   * @copydoc Dali::CanvasRenderer::Shape::SetStrokeCap()
    */
   virtual bool SetStrokeCap(Dali::CanvasRenderer::Shape::StrokeCap cap);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeCap
+   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeCap()
    */
   virtual Dali::CanvasRenderer::Shape::StrokeCap GetStrokeCap() const;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::SetStrokeJoin
+   * @copydoc Dali::CanvasRenderer::Shape::SetStrokeJoin()
    */
   virtual bool SetStrokeJoin(Dali::CanvasRenderer::Shape::StrokeJoin join);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeJoin
+   * @copydoc Dali::CanvasRenderer::Shape::GetStrokeJoin()
    */
   virtual Dali::CanvasRenderer::Shape::StrokeJoin GetStrokeJoin() const;