Merge "Synchronous Set/Get behaviour for default properties" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / layer-list.cpp

diff --git a/dali/internal/event/actors/layer-list.cpp b/dali/internal/event/actors/layer-list.cpp
index aff651c..82be760 100644 (file)
--- a/dali/internal/event/actors/layer-list.cpp
+++ b/dali/internal/event/actors/layer-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) 2014 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/internal/event/actors/layer-list.h>
@@ -23,7 +24,6 @@
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 #include <dali/internal/event/actors/layer-impl.h>
-#include <dali/internal/event/common/stage-impl.h>
 #include <dali/internal/update/manager/update-manager.h>
 
 namespace Dali
@@ -32,8 +32,6 @@ namespace Dali
 namespace Internal
 {
 
-
-
 namespace // unnamed namespace
 {
 
@@ -62,9 +60,9 @@ template<class InputIterator> InputIterator Find( InputIterator first, InputIter
 
 } // unnamed namespace
 
-LayerList* LayerList::New( Stage& stage, bool systemLevel )
+LayerList* LayerList::New( SceneGraph::UpdateManager& updateManager, bool systemLevel )
 {
-  return new LayerList( stage, systemLevel );
+  return new LayerList( updateManager, systemLevel );
 }
 
 LayerList::~LayerList()
@@ -236,8 +234,8 @@ void LayerList::MoveLayerBelow( const Layer& layer, const Layer& target )
   }
 }
 
-LayerList::LayerList( Stage& stage, bool systemLevel )
-: mStage( stage ),
+LayerList::LayerList( SceneGraph::UpdateManager& updateManager, bool systemLevel )
+: mUpdateManager( updateManager ),
   mIsSystemLevel( systemLevel )
 {
 }
@@ -257,7 +255,7 @@ void LayerList::SetLayerDepths()
   }
 
   // Layers are being used in a separate thread; queue a message to set order
-  SetLayerDepthsMessage( mStage.GetUpdateManager(), layers, mIsSystemLevel );
+  SetLayerDepthsMessage( mUpdateManager, layers, mIsSystemLevel );
 }
 
 } // namespace Internal