Revert "[Tizen] CanvasRenderer::Shape: Add ResetPath() method for reset path information"

This reverts commit c9d75bf0d05fc169578726017b971c8ffd252a60.

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-shape.cpp b/dali/devel-api/adaptor-framework/canvas-renderer-shape.cpp
index 56fc4ce..4dd6b75 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-shape.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer-shape.cpp
@@ -78,11 +78,6 @@ bool CanvasRenderer::Shape::Close()
   return GetImplementation(*this).Close();
 }
 
-bool CanvasRenderer::Shape::ResetPath()
-{
-  return GetImplementation(*this).ResetPath();
-}
-
 bool CanvasRenderer::Shape::SetFillColor(Vector4 color)
 {
   return GetImplementation(*this).SetFillColor(color);

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-shape.h b/dali/devel-api/adaptor-framework/canvas-renderer-shape.h
index 91ca295..ddd621c 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-shape.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer-shape.h
@@ -180,13 +180,6 @@ public:
   bool Close();
 
   /**
-   * @brief Reset the added path(rect, circle, path, etc...) information.
-   * Color and Stroke information are keeped.
-   * @return Returns True when it's successful. False otherwise.
-   */
-  bool ResetPath();
-
-  /**
    * @brief Set the color to use for filling the path.
    * @param[in] color The color value.
    * @return Returns True when it's successful. False otherwise.

diff --git a/dali/internal/canvas-renderer/common/shape-impl.cpp b/dali/internal/canvas-renderer/common/shape-impl.cpp
index b71e7a6..3b3e850 100644 (file)
--- a/dali/internal/canvas-renderer/common/shape-impl.cpp
+++ b/dali/internal/canvas-renderer/common/shape-impl.cpp
@@ -63,11 +63,6 @@ bool Shape::Close()
   return false;
 }
 
-bool Shape::ResetPath()
-{
-  return false;
-}
-
 bool Shape::SetFillColor(Vector4 color)
 {
   return false;

diff --git a/dali/internal/canvas-renderer/common/shape-impl.h b/dali/internal/canvas-renderer/common/shape-impl.h
index 2b61935..e5b485d 100644 (file)
--- a/dali/internal/canvas-renderer/common/shape-impl.h
+++ b/dali/internal/canvas-renderer/common/shape-impl.h
@@ -82,16 +82,11 @@ public:
   virtual bool AddCubicTo(Vector2 controlPoint1, Vector2 controlPoint2, Vector2 endPoint);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::Close
+   * @copydoc Dali::CanvasRenderer::Shape::AddClose
    */
   virtual bool Close();
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::ResetPath
-   */
-  virtual bool ResetPath();
-
-  /**
    * @copydoc Dali::CanvasRenderer::Shape::SetFillColor
    */
   virtual bool SetFillColor(Vector4 color);

diff --git a/dali/internal/canvas-renderer/tizen/shape-impl-tizen.cpp b/dali/internal/canvas-renderer/tizen/shape-impl-tizen.cpp
index 5351261..5e66c54 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/shape-impl-tizen.cpp
+++ b/dali/internal/canvas-renderer/tizen/shape-impl-tizen.cpp
@@ -184,27 +184,6 @@ bool ShapeTizen::Close()
   return true;
 }
 
-bool ShapeTizen::ResetPath()
-{
-#ifdef THORVG_SUPPORT
-  if(!mTvgShape)
-  {
-    DALI_LOG_ERROR("Shape is null\n");
-    return false;
-  }
-
-  if(static_cast<tvg::Shape*>(mTvgShape)->reset() != tvg::Result::Success)
-  {
-    DALI_LOG_ERROR("reset() fail.\n");
-    return false;
-  }
-  Drawable::SetChanged(true);
-  return true;
-#else
-  return false;
-#endif
-}
-
 bool ShapeTizen::SetFillColor(Vector4 color)
 {
   if(!mTvgShape)

diff --git a/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h b/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
index 156133b..578a135 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
@@ -81,11 +81,6 @@ public:
   bool Close() override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::ResetPath
-   */
-  bool ResetPath() override;
-
-  /**
    * @copydoc Dali::CanvasRenderer::Shape::SetFillColor
    */
   bool SetFillColor(Vector4 color) override;

diff --git a/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp
index ac6d09d..79a4871 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp
+++ b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp
@@ -217,27 +217,6 @@ bool ShapeUbuntu::Close()
 #endif
 }
 
-bool ShapeUbuntu::ResetPath()
-{
-#ifdef THORVG_SUPPORT
-  if(!mTvgShape)
-  {
-    DALI_LOG_ERROR("Shape is null\n");
-    return false;
-  }
-
-  if(static_cast<tvg::Shape*>(mTvgShape)->reset() != tvg::Result::Success)
-  {
-    DALI_LOG_ERROR("reset() fail.\n");
-    return false;
-  }
-  Drawable::SetChanged(true);
-  return true;
-#else
-  return false;
-#endif
-}
-
 bool ShapeUbuntu::SetFillColor(Vector4 color)
 {
 #ifdef THORVG_SUPPORT

diff --git a/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
index bd4b087..491a2bd 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
@@ -83,11 +83,6 @@ public:
   bool Close() override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Shape::ResetPath
-   */
-  bool ResetPath() override;
-
-  /**
    * @copydoc Dali::CanvasRenderer::Shape::SetFillColor
    */
   bool SetFillColor(Vector4 color) override;