X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fcanvas-renderer%2Ftizen%2Fdrawable-impl-tizen.h;h=b37ae2d6273be418be7f5e7c501b8c11a852d193;hb=da0e60c71a76caf31e235f48eea008766020dbcf;hp=dd1a6bec471642100a47139169cbc56cf982be76;hpb=0d4adf79c0991f674775be199b1f6be17f525ce0;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.h b/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.h
index dd1a6be..b37ae2d 100644
--- a/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.h
@@ -49,65 +49,99 @@ public:
   static DrawableTizen* New();
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::SetOpacity
+   * @copydoc Dali::CanvasRenderer::Drawable::SetOpacity()
    */
   bool SetOpacity(float opacity) override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::GetOpacity
+   * @copydoc Dali::CanvasRenderer::Drawable::GetOpacity()
    */
   float GetOpacity() const override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::Rotate
+   * @copydoc Dali::CanvasRenderer::Drawable::Rotate()
    */
   bool Rotate(Degree degree) override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::Scale
+   * @copydoc Dali::CanvasRenderer::Drawable::Scale()
    */
   bool Scale(float factor) override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::Translate
+   * @copydoc Dali::CanvasRenderer::Drawable::Translate()
    */
   bool Translate(Vector2 translate) override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::Transform
+   * @copydoc Dali::CanvasRenderer::Drawable::Transform()
    */
   bool Transform(const Dali::Matrix3& matrix) override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::GetBoundingBox
+   * @copydoc Dali::CanvasRenderer::Drawable::GetBoundingBox()
    */
   Rect<float> GetBoundingBox() const override;
+  /**
+   * @copydoc Dali::CanvasRenderer::Drawable::SetClipPath()
+   */
+  bool SetClipPath(Dali::CanvasRenderer::Drawable& clip) override;
+
+  /**
+   * @copydoc Dali::CanvasRenderer::Drawable::SetMask()
+   */
+  bool SetMask(Dali::CanvasRenderer::Drawable& mask, Dali::CanvasRenderer::Drawable::MaskType type) override;
+
+  /**
+   * @copydoc Internal::Adaptor::Drawable::GetCompositionDrawable()
+   */
+  Dali::CanvasRenderer::Drawable GetCompositionDrawable() const override;
+
+  /**
+   * @copydoc Internal::Adaptor::Drawable::GetCompositionType()
+   */
+  CompositionType GetCompositionType() const override;
 
   /**
-   * @copydoc Internal::Adaptor::Drawable::SetDrawableAdded
+   * @copydoc Internal::Adaptor::Drawable::SetAdded()
    */
-  void SetDrawableAdded(bool added) override;
+  void SetAdded(bool added) override;
 
   /**
-   * @copydoc Internal::Adaptor::Drawable::SetObject
+   * @copydoc Internal::Adaptor::Drawable::IsAdded()
+   */
+  bool IsAdded() const override;
+
+  /**
+   * @copydoc Internal::Adaptor::Drawable::SetObject()
    */
   void* GetObject() const override;
 
   /**
-   * @copydoc Internal::Adaptor::Drawable::GetObject
+   * @copydoc Internal::Adaptor::Drawable::GetObject()
    */
   void SetObject(const void* object) override;
 
   /**
-   * @copydoc Internal::Adaptor::Drawable::SetChanged
+   * @copydoc Internal::Adaptor::Drawable::SetChanged()
    */
   void SetChanged(bool changed) override;
 
   /**
-   * @copydoc Internal::Adaptor::Drawable::GetChanged
+   * @copydoc Internal::Adaptor::Drawable::GetChanged()
    */
   bool GetChanged() const override;
 
+  /**
+   * @copydoc Internal::Adaptor::Drawable::SetType()
+   */
+  void SetType(Types type);
+
+  /**
+   * @copydoc Internal::Adaptor::Drawable::GetType()
+   */
+  Types GetType() const;
+
   DrawableTizen(const Drawable&) = delete;
   DrawableTizen& operator=(Drawable&) = delete;
   DrawableTizen(Drawable&&)           = delete;
@@ -125,8 +159,11 @@ protected:
   virtual ~DrawableTizen() override;
 
 private:
-  bool mAdded;
-  bool mChanged;
+  bool                           mAdded;
+  bool                           mChanged;
+  Drawable::Types                mType;
+  Drawable::CompositionType      mCompositionType;
+  Dali::CanvasRenderer::Drawable mCompositionDrawable;
 
 #ifdef THORVG_SUPPORT
   tvg::Paint* mTvgPaint;