projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
3e09540
..
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();
}
mRenderTaskList.Reset();
}
- if( ThreadLocalStorage::Created() )
- {
- ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal();
- tls->RemoveScene( this );
- }
+ // Discard this Scene from the Core
+ Discard();
}
void Scene::Initialize()
}
void Scene::Initialize()
@@
-111,7
+108,7
@@
void Scene::Initialize()
mLayerList = LayerList::New( updateManager );
// The scene owns the default layer
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 );
mRootLayer->SetName("RootLayer");
mRootLayer->SetScene( *this );
@@
-255,6
+252,15
@@
Integration::RenderSurface* Scene::GetSurface() const
return mSurface;
}
return mSurface;
}
+void Scene::Discard()
+{
+ if( ThreadLocalStorage::Created() )
+ {
+ ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal();
+ tls->RemoveScene( this );
+ }
+}
+
void Scene::RequestRebuildDepthTree()
{
mDepthTreeDirty = true;
void Scene::RequestRebuildDepthTree()
{
mDepthTreeDirty = true;