projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix to use world color for the Fade Transition." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
transition
/
transition-lifecycle-controller.h
diff --git
a/dali-toolkit/internal/transition/transition-lifecycle-controller.h
b/dali-toolkit/internal/transition/transition-lifecycle-controller.h
index
8511635
..
b064f1e
100644
(file)
--- a/
dali-toolkit/internal/transition/transition-lifecycle-controller.h
+++ b/
dali-toolkit/internal/transition/transition-lifecycle-controller.h
@@
-33,24
+33,11
@@
namespace Toolkit
{
namespace Internal
{
{
namespace Internal
{
-class TransitionLifecycleController;
-
-namespace
-{
-std::unique_ptr<TransitionLifecycleController> instance = nullptr;
-std::once_flag onceFlag;
-} // namespace
class TransitionLifecycleController : public ConnectionTracker
{
public:
class TransitionLifecycleController : public ConnectionTracker
{
public:
- static TransitionLifecycleController& GetInstance()
- {
- std::call_once(onceFlag, []() {
- instance.reset(new TransitionLifecycleController);
- });
- return *(instance.get());
- }
+ static TransitionLifecycleController& GetInstance();
void AddTransitions(Dali::Toolkit::TransitionSet transitions);
void AddTransitions(Dali::Toolkit::TransitionSet transitions);
@@
-70,7
+57,9
@@
private:
TransitionLifecycleController& operator=(const TransitionLifecycleController& rhs) = delete;
private:
TransitionLifecycleController& operator=(const TransitionLifecycleController& rhs) = delete;
private:
- std::vector<Dali::Toolkit::TransitionSet> mTransitionList;
+ std::vector<Dali::Toolkit::TransitionSet> mTransitionList;
+ static std::unique_ptr<TransitionLifecycleController> mInstance;
+ static std::once_flag mOnceFlag;
};
} // namespace Internal
};
} // namespace Internal