X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fnodes%2Fscene-graph-layer.h;h=eec47c43a7cb01b2487c77d397cf683de1cc9712;hb=1df71fd493274d6955936dea699f1e98bb191f16;hp=26b217e8de98d1cc7288d4b6c127c3832377f9ba;hpb=1c21029fa51ea8e75575aca5ad65d36056609621;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 100755 new mode 100644 index 26b217e..eec47c4 --- 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,14 +336,8 @@ inline void SetDepthTestDisabledMessage( EventThreadServices& eventThreadService // Template specialisation for OwnerPointer, because delete is protected template <> -inline void OwnerPointer::Reset() -{ - if (mObject != NULL) - { - Dali::Internal::SceneGraph::Node::Delete(mObject); - mObject = NULL; - } -} +void OwnerPointer::Reset(); + } // namespace Internal } // namespace Dali