(PropertyOwner) Distinguish between disconnection & destruction

[platform/core/uifw/dali-core.git] / dali / internal / update / common / property-owner.cpp

diff --git a/dali/internal/update/common/property-owner.cpp b/dali/internal/update/common/property-owner.cpp
index d2283e0..19389b8 100644 (file)
--- a/dali/internal/update/common/property-owner.cpp
+++ b/dali/internal/update/common/property-owner.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/update/common/property-owner.h>
@@ -40,7 +41,7 @@ PropertyOwner* PropertyOwner::New()
 
 PropertyOwner::~PropertyOwner()
 {
-  DisconnectFromSceneGraph();
+  Destroy();
 }
 
 void PropertyOwner::AddObserver(Observer& observer)
@@ -71,7 +72,7 @@ bool PropertyOwner::IsObserved()
   return mObservers.Count() != 0u;
 }
 
-void PropertyOwner::DisconnectFromSceneGraph()
+void PropertyOwner::Destroy()
 {
   // Notification for observers
   const ConstObserverIter endIter = mObservers.End();
@@ -86,6 +87,22 @@ void PropertyOwner::DisconnectFromSceneGraph()
   mConstraints.Clear();
 }
 
+void PropertyOwner::DisconnectFromSceneGraph( BufferIndex updateBufferIndex )
+{
+  // Notification for observers
+  const ConstObserverIter endIter = mObservers.End();
+  for( ConstObserverIter iter = mObservers.Begin(); iter != endIter; ++iter)
+  {
+    (*iter)->PropertyOwnerDisconnected( updateBufferIndex, *this );
+  }
+
+  // Clear observers as they are not interested in destroyed if they have received a disconnect
+  mObservers.Clear();
+
+  // Remove all constraints when disconnected from scene-graph
+  mConstraints.Clear();
+}
+
 void PropertyOwner::InstallCustomProperty(PropertyBase* property)
 {
   DALI_ASSERT_DEBUG( NULL != property );