Remove ConvertCoordinates(FloatPoint3...) and fixed memory leak

Change-Id: Id5c4a2cb9aed367ac5263850fea4e28d19c3c7cf
Signed-off-by: Dae Young Ryu <karzia@samsung.com>

diff --git a/inc/FUiAnimVisualElement.h b/inc/FUiAnimVisualElement.h
index b8c7d75..2ed2fb1 100644 (file)
--- a/inc/FUiAnimVisualElement.h
+++ b/inc/FUiAnimVisualElement.h
@@ -1304,27 +1304,6 @@ public:
        result ConvertCoordinates(Tizen::Graphics::FloatRectangle& rectangle, const VisualElement* pFromVisualElement) const;
 
        /**
-        * Converts the specified arrays of coordinates in @c pFromVisualElement coordinate space to this instance's coordinate space. @n
-        * The coordinate is converted by projecting it on the root coordinate space.
-        *
-        * @since                       2.0
-        *
-        * @return                      An error code
-        * @param[in,out]       x                               The point x coordinate to convert
-        * @param[in,out]       y                               The point y coordinate to convert
-        * @param[in,out]       z                               The point z coordinate to convert
-        * @param[in]           pFromVisualElement      The %VisualElement instance with @c point in its coordinate space
-        * @exception           E_SUCCESS                       The method is successful.
-        * @exception           E_INVALID_ARG           The input parameter is incorrect.
-        * @exception           E_INVALID_OPERATION             The current state of the instance prohibits the execution of the specified operation. @n
-        *                                                                                      The matrix for this conversion is singular that has a zero determinant.
-        * @remarks                     This instance and @c pFromVisualElement must share a common ancestor. @n
-        *                                      If @c null, it is regarded that @c point is in the root coordinate space.
-        * @see                         ConvertCoordinates(Tizen::Graphics::FloatRectangle& rectangle, const VisualElement* pFromVisualElement)
-        */
-       result ConvertCoordinates(Tizen::Graphics::FloatPoint3& v, const VisualElement* pFromVisualElement) const;
-
-       /**
         * Transforms point in @c pOriginVisualElement coordinate space into the specified vector in this instance's coordinate space.
         *
         * @since                       2.1

diff --git a/src/ui/animations/FUiAnimVisualElement.cpp b/src/ui/animations/FUiAnimVisualElement.cpp
index 0d75186..cb0848d 100644 (file)
--- a/src/ui/animations/FUiAnimVisualElement.cpp
+++ b/src/ui/animations/FUiAnimVisualElement.cpp
@@ -782,21 +782,6 @@ VisualElement::ConvertCoordinates(FloatRectangle& rectangle, const VisualElement
        return _pVisualElementImpl->ConvertCoordinates(rectangle, pFrom);
 }
 
-result
-VisualElement::ConvertCoordinates(Tizen::Graphics::FloatPoint3& v, const VisualElement* pFromVisualElement) const
-{
-       CHECK_CONSTRUCTED;
-
-       _VisualElementImpl* pFrom = null;
-
-       if (pFromVisualElement)
-       {
-               CHECK_PARAMETER_CONSTRUCTED(*pFromVisualElement);
-               pFrom = pFromVisualElement->_pVisualElementImpl;
-       }
-
-       return _pVisualElementImpl->ConvertCoordinates(&v.x, &v.y, &v.z, 1, pFrom);
-}
 
 FloatPoint3
 VisualElement::TransformVectorFromOrigin(const Tizen::Graphics::FloatPoint3& originPoint, const VisualElement* pOriginVisualElement) const

diff --git a/src/ui/animations/FUiAnim_VisualElementAnimationGroupImpl.cpp b/src/ui/animations/FUiAnim_VisualElementAnimationGroupImpl.cpp
index 963523c..7532c12 100644 (file)
--- a/src/ui/animations/FUiAnim_VisualElementAnimationGroupImpl.cpp
+++ b/src/ui/animations/FUiAnim_VisualElementAnimationGroupImpl.cpp
@@ -34,6 +34,7 @@ namespace Tizen { namespace Ui { namespace Animations
 
 
 _VisualElementAnimationGroupImpl::_VisualElementAnimationGroupImpl(void)
+       :__animationList(Tizen::Base::Collection::SingleObjectDeleter)
 {
        result r = __animationList.Construct();
 
@@ -41,6 +42,7 @@ _VisualElementAnimationGroupImpl::_VisualElementAnimationGroupImpl(void)
 }
 
 _VisualElementAnimationGroupImpl::_VisualElementAnimationGroupImpl(const _VisualElementAnimationGroupImpl& animationGroupImpl)
+       :__animationList(Tizen::Base::Collection::SingleObjectDeleter)
 {
        __animationList.Construct();
 
@@ -51,7 +53,7 @@ _VisualElementAnimationGroupImpl::_VisualElementAnimationGroupImpl(const _Visual
 
 _VisualElementAnimationGroupImpl::~_VisualElementAnimationGroupImpl(void)
 {
-       __animationList.RemoveAll(true);
+       __animationList.RemoveAll();
 }
 
 bool

diff --git a/src/ui/inc/FUiAnim_VisualElementImpl.h b/src/ui/inc/FUiAnim_VisualElementImpl.h
index b1419be..0873668 100644 (file)
--- a/src/ui/inc/FUiAnim_VisualElementImpl.h
+++ b/src/ui/inc/FUiAnim_VisualElementImpl.h
@@ -672,12 +672,17 @@ public:
         */
        _VisualElementImpl* GetChildAt(const Tizen::Graphics::FloatPoint& point);
 
+       /**
+        * Gets the top-most child VisualElement indicated by @c point.
+        * This method change @c point on the @c pFromElement into the @c point on this.
+        * @since               2.0
+        */
        result ConvertCoordinates(Tizen::Graphics::FloatPoint& point, const _VisualElementImpl* pFromElement) const;
        result ConvertCoordinates(Tizen::Graphics::FloatRectangle& rectangle, const _VisualElementImpl* pFromElement) const;
 
        /**
         * Converts the specified four 3-dimensional coordinates @c (x, y, z) in @c pFromVisualElement coordinate space to this instance's coordinate space.
-        *
+        * This method change the 3D coordinates @c pFromElement into the coordinates of 2D plane on this. so z will be become 0.
         * @since                       2.0
         *
         * @return                      An error code
@@ -696,6 +701,11 @@ public:
         */
        result ConvertCoordinates(float* x, float* y, float* z, int count, const _VisualElementImpl* pFromElement) const;
 
+       /**
+        * Return the specified 3D coordinates in @c pFromVisualElement coordinate space to this instance's coordinate space.
+        * @since                       2.0
+        */
+
        Tizen::Graphics::FloatPoint3 TransformVectorFromOrigin(const Tizen::Graphics::FloatPoint3& originPoint, const _VisualElementImpl* pOriginVisualElement) const;
 
        result AddAnimation(const Tizen::Base::String* keyName, VisualElementAnimation& animation);