X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fnodes%2Fscene-graph-layer.h;h=29ed244030002558d9877dd775966634131ec379;hb=01c39de261f6eb4e759c7a249e5d67dfef83bca2;hp=f56bdd3a8cd77813845cd8986063d0a8a8db2c8e;hpb=7de4420e973684c55992624fb93b361a9a2fcda3;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/update/nodes/scene-graph-layer.h b/dali/internal/update/nodes/scene-graph-layer.h old mode 100644 new mode 100755 index f56bdd3..29ed244 --- a/dali/internal/update/nodes/scene-graph-layer.h +++ b/dali/internal/update/nodes/scene-graph-layer.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_SCENE_GRAPH_LAYER_H /* - * Copyright (c) 2016 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. @@ -77,9 +77,10 @@ public: /** * Construct a new Layer. + * @param[in] id The Unique ID of the actor creating the node * @return A smart-pointer to a newly allocated Node */ - static SceneGraph::Layer* New(); + static SceneGraph::Layer* New( unsigned int id ); /** * From Node, to convert a node to a layer. @@ -205,9 +206,10 @@ private: /** * Private constructor. + * @param[in] id The Unique ID of the actor creating the node * See also Layer::New() */ - Layer(); + Layer( unsigned int id ); // Undefined Layer(const Layer&); @@ -334,8 +336,14 @@ inline void SetDepthTestDisabledMessage( EventThreadServices& eventThreadService // Template specialisation for OwnerPointer, because delete is protected template <> -void OwnerPointer::Reset(); - +inline void OwnerPointer::Reset() +{ + if (mObject != NULL) + { + Dali::Internal::SceneGraph::Node::Delete(mObject); + mObject = NULL; + } +} } // namespace Internal } // namespace Dali