Revert "[Tizen] Add screen and client rotation itself function"

[platform/core/uifw/dali-core.git] / dali / internal / event / common / property-notification-impl.cpp

diff --git a/dali/internal/event/common/property-notification-impl.cpp b/dali/internal/event/common/property-notification-impl.cpp
index 7531a64..7e407ca 100644 (file)
--- a/dali/internal/event/common/property-notification-impl.cpp
+++ b/dali/internal/event/common/property-notification-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 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.
@@ -46,44 +46,36 @@ PropertyNotificationPtr PropertyNotification::New(Property& target,
 
   UpdateManager& updateManager = tls.GetUpdateManager();
 
-  PropertyNotificationManager& propertyNotificationManager = Stage::GetCurrent()->GetPropertyNotificationManager();
-
+  PropertyNotificationManager& propertyNotificationManager = tls.GetPropertyNotificationManager();
   PropertyNotificationPtr propertyNotification = new PropertyNotification(updateManager,
                                                                           propertyNotificationManager,
                                                                           target,
                                                                           componentIndex,
                                                                           condition);
-
   return propertyNotification;
 }
 
-PropertyNotification::PropertyNotification(UpdateManager& updateManager,
-                                           PropertyNotificationManager& propertyNotificationManager,
-                                           Property& target,
-                                           int componentIndex,
-                                           const Dali::PropertyCondition& condition)
-: mUpdateManager(updateManager),
-  mPropertyNotification(NULL),
-  mPropertyNotificationManager(propertyNotificationManager),
-  mObjectPropertyIndex(target.propertyIndex),
-  mPropertyType(Property::NONE),
-  mComponentIndex(componentIndex),
-  mCondition(condition),
-  mNotifyMode(Dali::PropertyNotification::NotifyOnTrue),
-  mNotifyResult(false)
-{
-  // Set condition arguments (as simple vector of floats)
-  PropertyCondition::ArgumentContainer arguments = GetImplementation(condition).arguments;
-  PropertyCondition::ArgumentConstIter iter = arguments.begin();
-
-  while( iter != arguments.end() )
+PropertyNotification::PropertyNotification( UpdateManager& updateManager,
+                                            PropertyNotificationManager& propertyNotificationManager,
+                                            Property& target,
+                                            int componentIndex,
+                                            const Dali::PropertyCondition& condition )
+: mUpdateManager( updateManager ),
+  mPropertyNotification( NULL ),
+  mPropertyNotificationManager( propertyNotificationManager ),
+  mObjectPropertyIndex( target.propertyIndex ),
+  mPropertyType( Property::NONE ),
+  mComponentIndex( componentIndex ),
+  mCondition( condition ),
+  mNotifyMode( Dali::PropertyNotification::NotifyOnTrue ),
+  mNotifyResult( false )
+{
+  const Internal::PropertyCondition& conditionImpl = GetImplementation( condition );
+
+  Dali::Vector<float>::SizeType count = conditionImpl.arguments.Count();
+  for( Dali::Vector<float>::SizeType index = 0; index < count; ++index )
   {
-    const Property::Value& value = *iter;
-    float floatValue;
-    value.Get(floatValue);
-
-    mRawConditionArgs.PushBack( floatValue );
-    ++iter;
+    mRawConditionArgs.PushBack( conditionImpl.arguments[ index ] );
   }
 
   // Observe target object and create/destroy notification scene object accordingly.
@@ -109,13 +101,8 @@ PropertyNotification::PropertyNotification(UpdateManager& updateManager,
       }
     }
 
-    // Check if target scene-object already present, and if so create our notification
-    // scene-object
-    const SceneGraph::PropertyOwner* object = mObject->GetSceneObject();
-    if (object)
-    {
-      CreateSceneObject();
-    }
+    // all objects always have scene object
+    CreateSceneObject();
   }
 
   // Connect to the property notification manager
@@ -212,19 +199,16 @@ void PropertyNotification::CreateSceneObject()
   // this method can be called from constructor and on stage connection
   if( !mPropertyNotification )
   {
-    // Create a new PropertyNotification, temporarily owned
-    SceneGraph::PropertyNotification* propertyNotification = SceneGraph::PropertyNotification::New( *mObject,
-                                                                                                    mObjectPropertyIndex,
-                                                                                                    mPropertyType,
-                                                                                                    mComponentIndex,
-                                                                                                    GetImplementation(mCondition).type,
-                                                                                                    mRawConditionArgs,
-                                                                                                    mNotifyMode );
-    // Keep a const pointer to the PropertyNotification.
-    mPropertyNotification = propertyNotification;
-
-    // Transfer scene object ownership to the update manager through a message
-    AddPropertyNotificationMessage( mUpdateManager, propertyNotification );
+    // Create a new PropertyNotification, keep a const pointer to it
+    mPropertyNotification = SceneGraph::PropertyNotification::New( *mObject,
+                                                                   mObjectPropertyIndex,
+                                                                   mPropertyType,
+                                                                   mComponentIndex,
+                                                                   GetImplementation( mCondition ).type,
+                                                                   mRawConditionArgs,
+                                                                   mNotifyMode );
+    OwnerPointer< SceneGraph::PropertyNotification > transferOwnership( const_cast<SceneGraph::PropertyNotification*>( mPropertyNotification ) );
+    AddPropertyNotificationMessage( mUpdateManager, transferOwnership );
   }
 }