From: Seoyeon Kim Date: Tue, 13 Jun 2017 01:32:18 +0000 (+0900) Subject: Revert "[Tizen] Fix memory leak issue in dali core" X-Git-Tag: accepted/tizen/unified/20170614.141242~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8ba19518e5d3008519b435b6baaf7352388e1d5;p=platform%2Fcore%2Fuifw%2Fdali-core.git Revert "[Tizen] Fix memory leak issue in dali core" This reverts commit cd1f8c935c88054e546c76834f077ba6677facb5. Change-Id: Ie8107ab947cd450b2fecc38817f803915889bc59 --- diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp old mode 100755 new mode 100644 index 4ad7d29..2ab1558 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -2446,7 +2446,6 @@ void Actor::RebuildDepthTree() SetDepthIndicesMessage( GetEventThreadServices().GetUpdateManager(), sceneGraphNodeDepths ); DALI_LOG_TIMER_END(depthTimer, gLogFilter, Debug::Concise, "Depth tree create time: "); - rootNode->~ActorDepthTreeNode(); } /** diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h old mode 100755 new mode 100644 index e0f200f..b7e177d --- a/dali/internal/event/actors/actor-impl.h +++ b/dali/internal/event/actors/actor-impl.h @@ -2008,17 +2008,15 @@ public: { if( mFirstChildNode ) { - mFirstChildNode->~ActorDepthTreeNode(); + delete mFirstChildNode; mFirstChildNode = NULL; } if( mNextSiblingNode ) { - mNextSiblingNode->~ActorDepthTreeNode(); + delete mNextSiblingNode; mNextSiblingNode = NULL; } mParentNode = NULL; - - mActors.clear(); } uint16_t GetSiblingOrder() diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp old mode 100755 new mode 100644 index c6d67ea..344891a --- a/dali/internal/update/manager/update-manager.cpp +++ b/dali/internal/update/manager/update-manager.cpp @@ -1053,7 +1053,6 @@ void UpdateManager::SetDepthIndices( NodeDepths* nodeDepths ) { iter->node->SetDepthIndex( iter->sortedDepth ); } - delete nodeDepths; } }