CanvasRenderer: Refactoring tvgObject management

[platform/core/uifw/dali-adaptor.git] / dali / internal / canvas-renderer / ubuntu / canvas-renderer-impl-ubuntu.h

diff --git a/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
index de5188a..2c91ab8 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
@@ -22,13 +22,13 @@
 #ifdef THORVG_SUPPORT
 #include <thorvg.h>
 #endif
-#include <dali/public-api/object/base-object.h>
 #include <dali/public-api/object/weak-handle.h>
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
 #include <dali/devel-api/adaptor-framework/canvas-renderer.h>
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/internal/canvas-renderer/common/drawable-group-impl.h>
 #include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>
 
 namespace Dali
@@ -104,6 +104,16 @@ private:
    */
   void MakeTargetBuffer(const Vector2& size);
 
+#ifdef THORVG_SUPPORT
+  /**
+   * @brief Push drawable object to parent.
+   * If drawable is a type that can have child drawables, it is called recursively.
+   * @param[in] drawable The drawable object.
+   * @param[in] group The scene object of tvg that can be drawable group.
+   */
+  void PushDrawableToGroup(Dali::CanvasRenderer::Drawable& drawable, tvg::Scene* group);
+#endif
+
 private:
   Devel::PixelBuffer mPixelBuffer;
 
@@ -111,9 +121,7 @@ private:
   std::unique_ptr<tvg::SwCanvas> mTvgCanvas;
   tvg::Scene*                    mTvgRoot;
 #endif
-  using DrawableVector         = std::vector<WeakHandle<Dali::CanvasRenderer::Drawable>>;
-  using DrawableVectorIterator = DrawableVector::iterator;
-  DrawableVector mDrawables;
+  DrawableGroup::DrawableVector mDrawables;
 
   Vector2 mSize;
   Vector2 mViewBox;