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
Fix svace issue (initialize render task list membervalue)
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
render-tasks
/
scene-graph-render-task-list.cpp
diff --git
a/dali/internal/update/render-tasks/scene-graph-render-task-list.cpp
b/dali/internal/update/render-tasks/scene-graph-render-task-list.cpp
index
080e2f0
..
255b1b0
100644
(file)
--- a/
dali/internal/update/render-tasks/scene-graph-render-task-list.cpp
+++ b/
dali/internal/update/render-tasks/scene-graph-render-task-list.cpp
@@
-20,6
+20,7
@@
// INTERNAL INCLUDES
#include <dali/internal/common/memory-pool-object-allocator.h>
// INTERNAL INCLUDES
#include <dali/internal/common/memory-pool-object-allocator.h>
+#include <dali/internal/update/common/resetter-manager.h> ///< For AddInitializeResetter
namespace //Unnamed namespace
{
namespace //Unnamed namespace
{
@@
-44,6
+45,7
@@
RenderTaskList* RenderTaskList::New()
RenderTaskList::RenderTaskList()
: mNotificationObject(nullptr),
RenderTaskList::RenderTaskList()
: mNotificationObject(nullptr),
+ mResetterManager(nullptr),
mRenderMessageDispatcher(nullptr),
mOverlayRenderTask(nullptr)
{
mRenderMessageDispatcher(nullptr),
mOverlayRenderTask(nullptr)
{
@@
-56,9
+58,10
@@
void RenderTaskList::operator delete(void* ptr)
GetRenderTaskListMemoryPool().FreeThreadSafe(static_cast<RenderTaskList*>(ptr));
}
GetRenderTaskListMemoryPool().FreeThreadSafe(static_cast<RenderTaskList*>(ptr));
}
-void RenderTaskList::
SetRenderMessageDispatcher(RenderMessageDispatcher*
renderMessageDispatcher)
+void RenderTaskList::
Initialize(ResetterManager& resetterManager, RenderMessageDispatcher&
renderMessageDispatcher)
{
{
- mRenderMessageDispatcher = renderMessageDispatcher;
+ mResetterManager = &resetterManager;
+ mRenderMessageDispatcher = &renderMessageDispatcher;
}
void RenderTaskList::AddTask(OwnerPointer<RenderTask>& newTask)
}
void RenderTaskList::AddTask(OwnerPointer<RenderTask>& newTask)
@@
-66,7
+69,7
@@
void RenderTaskList::AddTask(OwnerPointer<RenderTask>& newTask)
DALI_ASSERT_DEBUG(newTask && "SceneGraph RenderTask is null");
DALI_ASSERT_DEBUG(mRenderMessageDispatcher != NULL && "RenderMessageDispatcher is null");
DALI_ASSERT_DEBUG(newTask && "SceneGraph RenderTask is null");
DALI_ASSERT_DEBUG(mRenderMessageDispatcher != NULL && "RenderMessageDispatcher is null");
- newTask->Initialize(*mRenderMessageDispatcher);
+ newTask->Initialize(*mRe
setterManager, *mRe
nderMessageDispatcher);
if(mOverlayRenderTask && mRenderTasks[mRenderTasks.Size() - 1] == mOverlayRenderTask)
{
if(mOverlayRenderTask && mRenderTasks[mRenderTasks.Size() - 1] == mOverlayRenderTask)
{