Merge "Synchronous Set/Get Behaviour for custom & animatable properties" into devel...

[platform/core/uifw/dali-core.git] / dali / internal / event / common / system-overlay-impl.cpp

diff --git a/dali/internal/event/common/system-overlay-impl.cpp b/dali/internal/event/common/system-overlay-impl.cpp
index d925dbd..8003cbd 100644 (file)
--- a/dali/internal/event/common/system-overlay-impl.cpp
+++ b/dali/internal/event/common/system-overlay-impl.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) 2016 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/common/system-overlay-impl.h>
@@ -20,9 +21,9 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/constants.h>
 #include <dali/internal/event/actors/camera-actor-impl.h>
+#include <dali/internal/event/actors/layer-impl.h>
 #include <dali/internal/event/actors/layer-list.h>
-#include <dali/internal/event/actor-attachments/camera-attachment-impl.h>
-#include <dali/internal/event/common/stage-impl.h>
+#include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/render-tasks/render-task-list-impl.h>
 
 namespace Dali
@@ -31,9 +32,9 @@ namespace Dali
 namespace Internal
 {
 
-SystemOverlay* SystemOverlay::New( Stage& stage )
+SystemOverlay* SystemOverlay::New( EventThreadServices& eventThreadServices )
 {
-  SystemOverlay* overlay = new SystemOverlay( stage );
+  SystemOverlay* overlay = new SystemOverlay( eventThreadServices );
 
   overlay->Initialize();
 
@@ -69,7 +70,7 @@ RenderTaskList& SystemOverlay::GetOverlayRenderTasks()
 {
   if ( !mOverlayRenderTaskList )
   {
-    mOverlayRenderTaskList = RenderTaskList::New( mStage.GetUpdateManager(), *this, true/*system-overlay*/ );
+    mOverlayRenderTaskList = RenderTaskList::New( mEventThreadServices, *this, true/*system-overlay*/ );
   }
 
   return *mOverlayRenderTaskList;
@@ -110,15 +111,15 @@ CameraActor& SystemOverlay::GetDefaultCameraActor()
   return *mDefaultCameraActor;
 }
 
-SystemOverlay::SystemOverlay( Stage& stage )
-: mStage( stage )
+SystemOverlay::SystemOverlay( EventThreadServices& eventThreadServices )
+: mEventThreadServices( eventThreadServices )
 {
 }
 
 void SystemOverlay::Initialize()
 {
   // Create the ordered list of layers
-  mLayerList = LayerList::New( mStage, true/*system layers*/ );
+  mLayerList = LayerList::New( mEventThreadServices.GetUpdateManager(), true/*system layers*/ );
 }
 
 void SystemOverlay::CreateRootLayer()
@@ -126,7 +127,7 @@ void SystemOverlay::CreateRootLayer()
   // Lazy initialization; SystemOverlay may never be used
   if ( !mRootLayer )
   {
-    mRootLayer = Layer::NewRoot( mStage, *mLayerList, mStage.GetUpdateManager(), true/*system layer*/ );
+    mRootLayer = Layer::NewRoot( *mLayerList, mEventThreadServices.GetUpdateManager(), true/*system layer*/ );
     mRootLayer->SetName("SystemOverlayRoot");
     mRootLayer->SetSize( mSize.width, mSize.height );
   }