Merge "Clean up the code to build successfully on macOS" into devel/master

[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 ba1a682..eb495ba 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,15 @@
 #include <dali/internal/update/render-tasks/scene-graph-render-task-list.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/update/render-tasks/scene-graph-render-task.h>
-#include <dali/internal/update/resources/complete-status-manager.h>
+#include <dali/internal/common/memory-pool-object-allocator.h>
+
+namespace //Unnamed namespace
+{
+
+//Memory pool used to allocate new RenderTaskLists. Memory used by this pool will be released when shutting down DALi
+Dali::Internal::MemoryPoolObjectAllocator<Dali::Internal::SceneGraph::RenderTaskList> gRenderTaskListMemoryPool;
+
+} // unnamed namespace
 
 namespace Dali
 {
@@ -31,22 +38,37 @@ namespace Internal
 namespace SceneGraph
 {
 
-RenderTaskList::RenderTaskList(CompleteStatusManager& completeStatusManager)
-: mCompleteStatusManager( completeStatusManager )
+RenderTaskList* RenderTaskList::New()
+{
+  return new ( gRenderTaskListMemoryPool.AllocateRawThreadSafe() ) RenderTaskList();
+}
+
+RenderTaskList::RenderTaskList()
+: mNotificationObject( nullptr ),
+  mRenderMessageDispatcher( nullptr )
+{
+}
+
+RenderTaskList::~RenderTaskList() = default;
+
+void RenderTaskList::operator delete( void* ptr )
 {
+  gRenderTaskListMemoryPool.FreeThreadSafe( static_cast<RenderTaskList*>( ptr ) );
 }
 
-RenderTaskList::~RenderTaskList()
+void RenderTaskList::SetRenderMessageDispatcher( RenderMessageDispatcher* renderMessageDispatcher )
 {
+  mRenderMessageDispatcher = renderMessageDispatcher;
 }
 
-void RenderTaskList::AddTask( RenderTask* newTask )
+void RenderTaskList::AddTask( OwnerPointer< RenderTask >& newTask )
 {
   DALI_ASSERT_DEBUG( newTask != NULL && "SceneGraph RenderTask is null");
+  DALI_ASSERT_DEBUG( mRenderMessageDispatcher != NULL && "RenderMessageDispatcher is null");
 
+  newTask->Initialize( *mRenderMessageDispatcher );
   // mRenderTasks container takes ownership
-  mRenderTasks.PushBack( newTask );
-  newTask->SetCompleteStatusManager( &mCompleteStatusManager );
+  mRenderTasks.PushBack( newTask.Release() );
 }
 
 void RenderTaskList::RemoveTask( RenderTask* task )
@@ -64,6 +86,11 @@ void RenderTaskList::RemoveTask( RenderTask* task )
   }
 }
 
+uint32_t RenderTaskList::GetTaskCount()
+{
+  return static_cast<uint32_t>( mRenderTasks.Count() );
+}
+
 RenderTaskList::RenderTaskContainer& RenderTaskList::GetTasks()
 {
   return mRenderTasks;