[dali_1.3.53] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / public-api / render-tasks / render-task-list.cpp

diff --git a/dali/public-api/render-tasks/render-task-list.cpp b/dali/public-api/render-tasks/render-task-list.cpp
index c898058..555acca 100644 (file)
--- a/dali/public-api/render-tasks/render-task-list.cpp
+++ b/dali/public-api/render-tasks/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.
@@ -37,24 +37,38 @@ RenderTaskList::~RenderTaskList()
 {
 }
 
+RenderTaskList::RenderTaskList(const RenderTaskList& handle)
+: BaseHandle(handle)
+{
+}
+
+RenderTaskList& RenderTaskList::operator=(const RenderTaskList& rhs)
+{
+  BaseHandle::operator=(rhs);
+  return *this;
+}
+
 RenderTask RenderTaskList::CreateTask()
 {
-  return GetImplementation(*this).CreateTask();
+  return RenderTask( GetImplementation(*this).CreateTask().Get() );
 }
 
 void RenderTaskList::RemoveTask( RenderTask task )
 {
-  GetImplementation(*this).RemoveTask( task );
+  if( task ) // don't crash if called with empty task handle
+  {
+    GetImplementation(*this).RemoveTask( GetImplementation( task ) );
+  }
 }
 
-unsigned int RenderTaskList::GetTaskCount() const
+uint32_t RenderTaskList::GetTaskCount() const
 {
   return GetImplementation(*this).GetTaskCount();
 }
 
-RenderTask RenderTaskList::GetTask( unsigned int index ) const
+RenderTask RenderTaskList::GetTask( uint32_t index ) const
 {
-  return GetImplementation(*this).GetTask( index );
+  return RenderTask( GetImplementation(*this).GetTask( index ).Get() );
 }
 
 RenderTaskList::RenderTaskList( Internal::RenderTaskList* internal )