Revert "[Tizen] (Animation) Ensure AnimateBy updates the cached event-side properties"

[platform/core/uifw/dali-core.git] / dali / internal / event / render-tasks / render-task-impl.cpp

diff --git a/dali/internal/event/render-tasks/render-task-impl.cpp b/dali/internal/event/render-tasks/render-task-impl.cpp
index 556d994..a97069b 100644 (file)
--- a/dali/internal/event/render-tasks/render-task-impl.cpp
+++ b/dali/internal/event/render-tasks/render-task-impl.cpp
@@ -69,17 +69,6 @@ TypeRegistration mType( typeid( Dali::RenderTask ), typeid( Dali::BaseHandle ),
 
 SignalConnectorType signalConnector1( mType, SIGNAL_FINISHED, &RenderTask::DoConnectSignal );
 
-/// Helper to adjust the current value of a variable from the given property-value
-template< typename PropertyType >
-inline void AdjustValue( PropertyType& currentValue, const Property::Value& value )
-{
-  PropertyType relativeValue;
-  if( value.Get( relativeValue ) )
-  {
-    currentValue += relativeValue;
-  }
-}
-
 } // Unnamed namespace
 
 RenderTask* RenderTask::New( bool isSystemLevel )
@@ -700,60 +689,30 @@ Property::Value RenderTask::GetDefaultPropertyCurrentValue( Property::Index inde
   return value;
 }
 
-void RenderTask::OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, PropertyChange::Type propertyChangeType )
+void RenderTask::OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value )
 {
-  if( propertyChangeType == Object::PropertyChange::SET )
+  switch ( index )
   {
-    switch ( index )
+    case Dali::RenderTask::Property::VIEWPORT_POSITION:
     {
-      case Dali::RenderTask::Property::VIEWPORT_POSITION:
-      {
-        value.Get( mViewportPosition );
-        break;
-      }
-      case Dali::RenderTask::Property::VIEWPORT_SIZE:
-      {
-        value.Get( mViewportSize );
-        break;
-      }
-      case Dali::RenderTask::Property::CLEAR_COLOR:
-      {
-        value.Get( mClearColor );
-        break;
-      }
-      case Dali::RenderTask::Property::REQUIRES_SYNC:
-      default:
-      {
-        // Nothing to do as not animatable
-        break;
-      }
+      value.Get( mViewportPosition );
+      break;
     }
-  }
-  else
-  {
-    switch ( index )
+    case Dali::RenderTask::Property::VIEWPORT_SIZE:
     {
-      case Dali::RenderTask::Property::VIEWPORT_POSITION:
-      {
-        AdjustValue< Vector2 >( mViewportPosition, value );
-        break;
-      }
-      case Dali::RenderTask::Property::VIEWPORT_SIZE:
-      {
-        AdjustValue< Vector2 >( mViewportSize, value );
-        break;
-      }
-      case Dali::RenderTask::Property::CLEAR_COLOR:
-      {
-        AdjustValue< Vector4 >( mClearColor, value );
-        break;
-      }
-      case Dali::RenderTask::Property::REQUIRES_SYNC:
-      default:
-      {
-        // Nothing to do as not animatable
-        break;
-      }
+      value.Get( mViewportSize );
+      break;
+    }
+    case Dali::RenderTask::Property::CLEAR_COLOR:
+    {
+      value.Get( mClearColor );
+      break;
+    }
+    case Dali::RenderTask::Property::REQUIRES_SYNC:
+    default:
+    {
+      // Nothing to do as not animatable
+      break;
     }
   }
 }