From bed3766e60c9c2a10fcc7c0741805a9d36d99d54 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Fri, 27 May 2022 11:14:04 +0900 Subject: [PATCH] Revert "[Tizen] Delete YGNode only root of Flex::Node" This reverts commit 53f5b8ddfd5b967bb49a2ec9cd9360a04fc33ecf. --- .../src/dali-toolkit/utc-Dali-FlexNode.cpp | 26 ---------------------- dali-toolkit/devel-api/layouting/flex-node.cpp | 7 ++---- dali-toolkit/devel-api/layouting/flex-node.h | 3 ++- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp index 6cef66a..4cfdd91 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp @@ -90,8 +90,6 @@ int UtcDaliToolkitFlexNodeAddChildWithMarginP(void) DALI_TEST_EQUALS(actorFrame, Vector4(5.0f, 5.0f, ITEM_SIZE.width + 5, ITEM_SIZE.height + 5), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -127,8 +125,6 @@ int UtcDaliToolkitFlexNodeAddChildrenRowP(void) DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); DALI_TEST_EQUALS(actor2Frame, Vector4(ITEM_SIZE.width, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -165,8 +161,6 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnP(void) DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -288,8 +282,6 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnJustify(void) DALI_TEST_EQUALS(actor2Frame, Vector4(root.z - ITEM_SIZE.width, root.w - (ITEM_SIZE.height * 2), root.z, root.w - ITEM_SIZE.height), TEST_LOCATION); DALI_TEST_EQUALS(actor3Frame, Vector4(root.z - ITEM_SIZE.width, root.w - ITEM_SIZE.height, root.z, root.w), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -314,8 +306,6 @@ int UtcDaliToolkitFlexNodeSizingP(void) DALI_TEST_EQUALS(flexNode->GetFlexWidth(), 480.0f, TEST_LOCATION); DALI_TEST_EQUALS(flexNode->GetFlexHeight(), 800.0f, TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -409,8 +399,6 @@ int UtcDaliToolkitFlexNodeWrapModeP(void) DALI_TEST_EQUALS(actor3Frame, Vector4(ITEM_SIZE.width * 2, 0.0f, ITEM_SIZE.width * 3, ITEM_SIZE.height), TEST_LOCATION); DALI_TEST_EQUALS(actor4Frame, Vector4(0.0, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -454,8 +442,6 @@ int UtcDaliToolkitFlexNodeRemoveChildP(void) DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -500,8 +486,6 @@ int UtcDaliToolkitFlexNodeRemoveAllChildrenP(void) DALI_TEST_NOT_EQUALS(actor1Frame, actor1FrameRemoved, 0.1, TEST_LOCATION); DALI_TEST_NOT_EQUALS(actor2Frame, actor2FrameRemoved, 0.1, TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -544,8 +528,6 @@ int UtcDaliToolkitFlexNodePaddingMarginP(void) DALI_TEST_EQUALS(actor1Frame, Vector4(5.0f, 5.0f, ITEM_SIZE.width + 5, ITEM_SIZE.height + 5), TEST_LOCATION); DALI_TEST_EQUALS(actor2Frame, Vector4(5 + ITEM_SIZE.width, 5.0f, (ITEM_SIZE.width * 2) + 5, ITEM_SIZE.height + 5), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -585,8 +567,6 @@ int UtcDaliToolkitFlexNodeCallbackTestP(void) DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE_CALLBACK_TEST.width, ITEM_SIZE_CALLBACK_TEST.height), TEST_LOCATION); DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE_CALLBACK_TEST.height, ITEM_SIZE.width, ITEM_SIZE_CALLBACK_TEST.height + ITEM_SIZE.height), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -662,8 +642,6 @@ int UtcDaliToolkitFlexNodeFlexPositionType(void) DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -732,8 +710,6 @@ int UtcDaliToolkitFlexNodeFlexAspectRatio(void) DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION); - delete flexNode; - END_TEST; } @@ -827,7 +803,5 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void) DALI_TEST_EQUALS(actor2Frame, Vector4(basis, 0.0f, basis + (root.z - basis) / 2, ITEM_SIZE.height), TEST_LOCATION); DALI_TEST_EQUALS(actor3Frame, Vector4(basis + (root.z - basis) / 2, 0.0f, root.z, ITEM_SIZE.height), TEST_LOCATION); - delete flexNode; - END_TEST; } diff --git a/dali-toolkit/devel-api/layouting/flex-node.cpp b/dali-toolkit/devel-api/layouting/flex-node.cpp index 8a7dae6..c3636dc 100644 --- a/dali-toolkit/devel-api/layouting/flex-node.cpp +++ b/dali-toolkit/devel-api/layouting/flex-node.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -93,12 +93,9 @@ Node::Node() Node::~Node() { DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() >> \n"); - // Destruct child Flex::Node first - mImpl->mChildNodes.clear(); - if(mImpl->mYogaNode) { - YGNodeFree(mImpl->mYogaNode); + YGNodeFreeRecursive(mImpl->mYogaNode); mImpl->mYogaNode = nullptr; } DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() <<\n"); diff --git a/dali-toolkit/devel-api/layouting/flex-node.h b/dali-toolkit/devel-api/layouting/flex-node.h index 44ddfc2..a7349fe 100644 --- a/dali-toolkit/devel-api/layouting/flex-node.h +++ b/dali-toolkit/devel-api/layouting/flex-node.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_LAYOUTING_FLEX_NODE_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -340,6 +340,7 @@ public: private: struct Impl; std::unique_ptr mImpl; + }; // Node } // namespace Flex -- 2.7.4