Merge "Fix PropertyNotification issue" into 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 5516c77..e52e2f4 100644 (file)
--- a/dali/public-api/render-tasks/render-task-list.cpp
+++ b/dali/public-api/render-tasks/render-task-list.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/public-api/render-tasks/render-task-list.h>
@@ -36,24 +37,42 @@ RenderTaskList::~RenderTaskList()
 {
 }
 
+RenderTaskList::RenderTaskList(const RenderTaskList& handle)
+: BaseHandle(handle)
+{
+}
+
+RenderTaskList& RenderTaskList::operator=(const RenderTaskList& rhs)
+{
+  BaseHandle::operator=(rhs);
+  return *this;
+}
+
+RenderTaskList::RenderTaskList( RenderTaskList&& rhs ) =  default;
+
+RenderTaskList& RenderTaskList::operator=( RenderTaskList&& rhs ) =  default;
+
 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 )