Revert "[Tizen] Add KeyEventGeneratedSignal for Get KeyEvent normally"

[platform/core/uifw/dali-core.git] / dali / internal / event / common / scene-impl.cpp

diff --git a/dali/internal/event/common/scene-impl.cpp b/dali/internal/event/common/scene-impl.cpp
index 0a065e9..a944d35 100644 (file)
--- a/dali/internal/event/common/scene-impl.cpp
+++ b/dali/internal/event/common/scene-impl.cpp
@@ -90,11 +90,8 @@ Scene::~Scene()
     mRenderTaskList.Reset();
   }
 
-  if( ThreadLocalStorage::Created() )
-  {
-    ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal();
-    tls->RemoveScene( this );
-  }
+  // Discard this Scene from the Core
+  Discard();
 }
 
 void Scene::Initialize()
@@ -111,7 +108,7 @@ void Scene::Initialize()
   mLayerList = LayerList::New( updateManager );
 
   // The scene owns the default layer
-  mRootLayer = Layer::NewRoot( *mLayerList, updateManager );
+  mRootLayer = Layer::NewRoot( *mLayerList );
   mRootLayer->SetName("RootLayer");
   mRootLayer->SetScene( *this );
 
@@ -255,6 +252,15 @@ Integration::RenderSurface* Scene::GetSurface() const
   return mSurface;
 }
 
+void Scene::Discard()
+{
+  if( ThreadLocalStorage::Created() )
+  {
+    ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal();
+    tls->RemoveScene( this );
+  }
+}
+
 void Scene::RequestRebuildDepthTree()
 {
   mDepthTreeDirty = true;
@@ -301,12 +307,6 @@ void Scene::EmitKeyEventSignal(const KeyEvent& event)
   mKeyEventSignal.Emit( event );
 }
 
-bool Scene::EmitKeyEventGeneratedSignal(const KeyEvent& event)
-{
-  // Emit the KeyEventGenerated signal when KeyEvent is generated
-  return mKeyEventGeneratedSignal.Emit( event );
-}
-
 void Scene::EmitEventProcessingFinishedSignal()
 {
   mEventProcessingFinishedSignal.Emit();
@@ -328,11 +328,6 @@ Integration::Scene::KeyEventSignalType& Scene::KeyEventSignal()
   return mKeyEventSignal;
 }
 
-Integration::Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal()
-{
-  return mKeyEventGeneratedSignal;
-}
-
 Integration::Scene::EventProcessingFinishedSignalType& Scene::EventProcessingFinishedSignal()
 {
   return mEventProcessingFinishedSignal;