From b8ba19518e5d3008519b435b6baaf7352388e1d5 Mon Sep 17 00:00:00 2001
From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 13 Jun 2017 10:32:18 +0900
Subject: [PATCH] Revert "[Tizen] Fix memory leak issue in dali core"

This reverts commit cd1f8c935c88054e546c76834f077ba6677facb5.

Change-Id: Ie8107ab947cd450b2fecc38817f803915889bc59
---
 dali/internal/event/actors/actor-impl.cpp       | 1 -
 dali/internal/event/actors/actor-impl.h         | 6 ++----
 dali/internal/update/manager/update-manager.cpp | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 dali/internal/event/actors/actor-impl.cpp
 mode change 100755 => 100644 dali/internal/event/actors/actor-impl.h
 mode change 100755 => 100644 dali/internal/update/manager/update-manager.cpp

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;
   }
 }
 
-- 
2.7.4