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
Merge branch 'devel/master (1.2.30)' into tizen
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
render-tasks
/
scene-graph-render-task-list.h
diff --git
a/dali/internal/update/render-tasks/scene-graph-render-task-list.h
b/dali/internal/update/render-tasks/scene-graph-render-task-list.h
index
ad40d2d
..
50542ed
100644
(file)
--- a/
dali/internal/update/render-tasks/scene-graph-render-task-list.h
+++ b/
dali/internal/update/render-tasks/scene-graph-render-task-list.h
@@
-2,7
+2,7
@@
#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_LIST_H__
/*
#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_LIST_H__
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
*
* 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,8
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
+#include <dali/devel-api/common/owner-container.h>
#include <dali/internal/common/message.h>
#include <dali/internal/common/message.h>
-#include <dali/internal/common/owner-container.h>
#include <dali/internal/event/common/event-thread-services.h>
namespace Dali
#include <dali/internal/event/common/event-thread-services.h>
namespace Dali
@@
-28,12
+28,12
@@
namespace Dali
namespace Internal
{
namespace Internal
{
-class CompleteStatusManager;
+
class CompleteNotificationInterface;
namespace SceneGraph
{
class CompleteNotificationInterface;
namespace SceneGraph
{
-
+class RenderMessageDispatcher;
class RenderTask;
/**
class RenderTask;
/**
@@
-47,8
+47,9
@@
public:
/**
* Constructor
/**
* Constructor
+ * @param renderMessageDispatcher to send messages
*/
*/
- RenderTaskList(
CompleteStatusManager& completeStatusManag
er );
+ RenderTaskList(
RenderMessageDispatcher& renderMessageDispatch
er );
/**
* Destructor
/**
* Destructor
@@
-101,8
+102,8
@@
private:
private:
CompleteNotificationInterface* mNotificationObject; ///< object to pass in to the complete notification
private:
CompleteNotificationInterface* mNotificationObject; ///< object to pass in to the complete notification
+ RenderMessageDispatcher& mRenderMessageDispatcher; ///< for sending messages to render thread
RenderTaskContainer mRenderTasks; ///< A container of owned RenderTasks
RenderTaskContainer mRenderTasks; ///< A container of owned RenderTasks
- CompleteStatusManager& mCompleteStatusManager; ///< The complete status tracker (render tasks need this)
};
};
@@
-110,7
+111,8
@@
private:
inline void AddTaskMessage( EventThreadServices& eventThreadServices, RenderTaskList& list, RenderTask& task )
{
inline void AddTaskMessage( EventThreadServices& eventThreadServices, RenderTaskList& list, RenderTask& task )
{
- typedef MessageValue1< RenderTaskList, RenderTask* > LocalType;
+ // Message has ownership of the RenderTask while in transit from event -> update
+ typedef MessageValue1< RenderTaskList, OwnerPointer< RenderTask > > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
// Reserve some memory inside the message queue
unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );