From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 10 Feb 2014 06:17:08 +0000 (+0900)
Subject: Remove root in animation manager and transaction
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=926f0a38bbb159efc1d25fc49cbee3ebd2aa026b;p=framework%2Fosp%2Fuifw.git

Remove root in animation manager and transaction

Change-Id: If7afdb0959e9ba5e5fb5bdf50efc4afe32239261
---

diff --git a/src/ui/animations/FUiAnim_AnimationManager.cpp b/src/ui/animations/FUiAnim_AnimationManager.cpp
index f15e6c5..4c40233 100644
--- a/src/ui/animations/FUiAnim_AnimationManager.cpp
+++ b/src/ui/animations/FUiAnim_AnimationManager.cpp
@@ -180,8 +180,7 @@ _AnimationManager::_RootInfo::Release(void)
 _AnimationManager* _AnimationManager::__pInstance = null;
 
 _AnimationManager::_AnimationManager(void)
-	: __root()
-	, __mainRoot()
+	: __mainRoot()
 	, __renderRoot()
 	, __pCurrentTransaction(null)
 	, __pCurrentTransactionExceptGroup(null)
@@ -268,7 +267,6 @@ _AnimationManager::Release(void)
 
 	__mainRoot.Release();
 	__renderRoot.Release();
-	__root.Release();
 
 	delete __pLock;
 
@@ -282,13 +280,9 @@ _AnimationManager::Construct(void)
 
 	__committedList.Construct();
 
-	__root.Construct();
 	__mainRoot.Construct();
 	__renderRoot.Construct();
 
-	__root.__pRootTransaction->AddChild(*__mainRoot.__pRootTransaction);
-	__root.__pRootTransaction->AddChild(*__renderRoot.__pRootTransaction);
-
 	__pDefaultTransactionEventListener = new (std::nothrow) _TransactionEventListener();
 	SysTryCatch(NID_UI_ANIM, __pDefaultTransactionEventListener != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
 		"[E_OUT_OF_MEMORY] Memory allocation failed. Failed to create default transaction event listener.");
@@ -312,7 +306,6 @@ CATCH:
 
 	__mainRoot.Release();
 	__renderRoot.Release();
-	__root.Release();
 
 	return r;
 }
@@ -610,7 +603,7 @@ _AnimationManager::BeginTransaction(void)
 
 	if (__pCurrentTransaction == null)
 	{
-		pNode = new (std::nothrow) _TransactionNode(*__root.__pRootTransaction);
+		pNode = new (std::nothrow) _TransactionNode();
 		SysTryReturn(NID_UI_ANIM, (pNode != null), -1, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed. Failed to create _TransactionNode.");
 
 		result r = GetLastResult();
diff --git a/src/ui/animations/FUiAnim_AnimationManager.h b/src/ui/animations/FUiAnim_AnimationManager.h
index b7ac5be..43077c5 100644
--- a/src/ui/animations/FUiAnim_AnimationManager.h
+++ b/src/ui/animations/FUiAnim_AnimationManager.h
@@ -121,7 +121,6 @@ private:
 private:
 	static _AnimationManager* __pInstance;
 
-	_RootInfo __root;
 	_RootInfo __mainRoot;
 	_RootInfo __renderRoot;
 
diff --git a/src/ui/animations/FUiAnim_TransactionNode.cpp b/src/ui/animations/FUiAnim_TransactionNode.cpp
index d19880d..1fd2aff 100644
--- a/src/ui/animations/FUiAnim_TransactionNode.cpp
+++ b/src/ui/animations/FUiAnim_TransactionNode.cpp
@@ -701,7 +701,6 @@ static int id = -1;
 _TransactionNode::_TransactionNode(void)
 	: __id(-1)
 	, __pParent(null)
-	, __pRoot(this)
 	, __pDefaultListener(null)
 	, __pListener(null)
 	, __isImplicitAnimationEnabled(true)
@@ -728,7 +727,6 @@ _TransactionNode::_TransactionNode(void)
 _TransactionNode::_TransactionNode(const _TransactionNode& node)
 	: __id(-1)
 	, __pParent(null)
-	, __pRoot(node.__pRoot)
 	, __pDefaultListener(null)
 	, __pListener(null)
 	, __isImplicitAnimationEnabled(node.__isImplicitAnimationEnabled)
diff --git a/src/ui/animations/FUiAnim_TransactionNode.h b/src/ui/animations/FUiAnim_TransactionNode.h
index 46552f7..874d04b 100644
--- a/src/ui/animations/FUiAnim_TransactionNode.h
+++ b/src/ui/animations/FUiAnim_TransactionNode.h
@@ -237,7 +237,6 @@ protected:
 	int __id;
 
 	_TransactionNode* __pParent;
-	_TransactionNode* __pRoot;
 
 	IAnimationTransactionEventListener* __pDefaultListener;
 	IAnimationTransactionEventListener* __pListener;