X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-impl.cpp;h=69e859bd6287fc08c282aaa344e14ee4b7523bf7;hp=1ae64111516887991ae61806ee68a1d29d49db0a;hb=HEAD;hpb=bdd76cbf2d4abdd7b88f5312702617ffd46eb96e

diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp
old mode 100755
new mode 100644
index 1ae6411..3d8e79e
--- a/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -20,52 +20,144 @@
 
 // EXTERNAL HEADER
 #include <dali-toolkit/public-api/dali-toolkit-common.h>
-#include <dali/devel-api/object/handle-devel.h>
-#include <dali/devel-api/scripting/enum-helper.h>
 #include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali/devel-api/scripting/enum-helper.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/rendering/decorated-visual-renderer.h>
+#include <dali/public-api/rendering/visual-renderer.h>
 
 //INTERNAL HEARDER
-#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
-#include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/color-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/internal/helpers/property-helper.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
 
 namespace
 {
 #if defined(DEBUG_ENABLED)
-Debug::Filter* gVisualBaseLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VISUAL_BASE" );
+Debug::Filter* gVisualBaseLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VISUAL_BASE");
 #endif
 
-const char * const PRE_MULTIPLIED_ALPHA_PROPERTY( "preMultipliedAlpha" );
+// visual string constants contains OFFSET_SIZE_MODE instead
+const char* const OFFSET_POLICY("offsetPolicy");
+const char* const SIZE_POLICY("sizePolicy");
 
 } // namespace
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 namespace
 {
+DALI_ENUM_TO_STRING_TABLE_BEGIN(VISUAL_FITTING_MODE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_KEEP_ASPECT_RATIO)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FILL)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, OVER_FIT_KEEP_ASPECT_RATIO)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, CENTER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_HEIGHT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_WIDTH)
+DALI_ENUM_TO_STRING_TABLE_END(VISUAL_FITTING_MODE)
+
+/**
+ * @brief Check whether this visual type can use corner radius feature or not.
+ * @param type VisualType that want to checkup
+ * @return true if type can use corner radius feature.
+ */
+static bool IsTypeAvailableForCornerRadius(Toolkit::Visual::Type type)
+{
+  switch(static_cast<Toolkit::DevelVisual::Type>(type))
+  {
+    case Toolkit::Visual::Type::COLOR:
+    case Toolkit::Visual::Type::GRADIENT:
+    case Toolkit::Visual::Type::IMAGE:
+    case Toolkit::Visual::Type::SVG:
+    case Toolkit::Visual::Type::ANIMATED_IMAGE:
+    case Toolkit::DevelVisual::Type::ANIMATED_VECTOR_IMAGE:
+    {
+      return true;
+    }
+    default:
+    {
+      return false;
+    }
+  }
+}
+
+/**
+ * @brief Check whether this visual type can use borderline feature or not.
+ * @param type VisualType that want to checkup
+ * @return true if type can use borderline feature.
+ */
+static bool IsTypeAvailableForBorderline(Toolkit::Visual::Type type)
+{
+  switch(static_cast<Toolkit::DevelVisual::Type>(type))
+  {
+    case Toolkit::Visual::Type::COLOR:
+    case Toolkit::Visual::Type::GRADIENT:
+    case Toolkit::Visual::Type::IMAGE:
+    case Toolkit::Visual::Type::SVG:
+    case Toolkit::Visual::Type::ANIMATED_IMAGE:
+    case Toolkit::DevelVisual::Type::ANIMATED_VECTOR_IMAGE:
+    {
+      return true;
+    }
+    default:
+    {
+      return false;
+    }
+  }
+}
 
-DALI_ENUM_TO_STRING_TABLE_BEGIN( VISUAL_FITTING_MODE )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FIT_KEEP_ASPECT_RATIO  )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FILL  )
-DALI_ENUM_TO_STRING_TABLE_END( VISUAL_FITTING_MODE )
+struct StringProperty
+{
+  const char* const name;
+  Property::Index   index;
+};
+StringProperty PROPERTY_NAME_INDEX_TABLE[] =
+  {
+    {CUSTOM_SHADER, Toolkit::Visual::Property::SHADER},
+    {TRANSFORM, Toolkit::Visual::Property::TRANSFORM},
+    {PREMULTIPLIED_ALPHA, Toolkit::Visual::Property::PREMULTIPLIED_ALPHA},
+    {MIX_COLOR, Toolkit::Visual::Property::MIX_COLOR},
+    {OPACITY, Toolkit::Visual::Property::OPACITY},
+    {VISUAL_FITTING_MODE, Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE},
+    {BORDERLINE_WIDTH, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH},
+    {BORDERLINE_COLOR, Toolkit::DevelVisual::Property::BORDERLINE_COLOR},
+    {BORDERLINE_OFFSET, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET},
+    {CORNER_RADIUS, Toolkit::DevelVisual::Property::CORNER_RADIUS},
+    {CORNER_RADIUS_POLICY, Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY},
+};
+const uint16_t PROPERTY_NAME_INDEX_TABLE_COUNT = sizeof(PROPERTY_NAME_INDEX_TABLE) / sizeof(PROPERTY_NAME_INDEX_TABLE[0]);
+
+Property::Index GetVisualPropertyIndex(Property::Key key)
+{
+  if(key.type == Property::Key::STRING)
+  {
+    for(auto tableId = 0u; tableId < PROPERTY_NAME_INDEX_TABLE_COUNT; ++tableId)
+    {
+      if(key == PROPERTY_NAME_INDEX_TABLE[tableId].name)
+      {
+        return PROPERTY_NAME_INDEX_TABLE[tableId].index;
+        break;
+      }
+    }
+  }
+  return key.indexKey;
+}
 
 } // namespace
 
-Visual::Base::Base( VisualFactoryCache& factoryCache, FittingMode fittingMode )
-: mImpl( new Impl(fittingMode) ),
-  mFactoryCache( factoryCache )
+Visual::Base::Base(VisualFactoryCache& factoryCache, FittingMode fittingMode, Toolkit::Visual::Type type)
+: mImpl(new Impl(fittingMode, type)),
+  mFactoryCache(factoryCache)
 {
 }
 
@@ -74,63 +166,59 @@ Visual::Base::~Base()
   delete mImpl;
 }
 
-void Visual::Base::SetCustomShader( const Property::Map& shaderMap )
+void Visual::Base::Initialize()
+{
+  // The Renderer should be created inside derived class here.
+  OnInitialize();
+
+  if(mImpl->mRenderer)
+  {
+    RegisterMixColor();
+    RegisterDecoration();
+
+    if(IsBorderlineRequired())
+    {
+      mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL);
+    }
+    else if(IsRoundedCornerRequired())
+    {
+      mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+    }
+  }
+}
+
+void Visual::Base::SetCustomShader(const Property::Map& shaderMap)
 {
-  if( mImpl->mCustomShader )
+  if(mImpl->mCustomShader)
   {
-    mImpl->mCustomShader->SetPropertyMap( shaderMap );
+    mImpl->mCustomShader->SetPropertyMap(shaderMap);
   }
   else
   {
-    mImpl->mCustomShader = new Impl::CustomShader( shaderMap );
+    mImpl->mCustomShader = new Impl::CustomShader(shaderMap);
   }
+
+  // Let derived class know
+  UpdateShader();
 }
 
-void Visual::Base::SetProperties( const Property::Map& propertyMap )
+void Visual::Base::SetProperties(const Property::Map& propertyMap)
 {
-  for( size_t i = 0; i < propertyMap.Count(); ++i )
+  bool needUpdateShader = false;
+  for(size_t i = 0; i < propertyMap.Count(); ++i)
   {
-    const KeyValuePair& pair = propertyMap.GetKeyValue( i );
-    const Property::Key& key = pair.first;
+    const KeyValuePair&    pair  = propertyMap.GetKeyValue(i);
+    const Property::Key&   key   = pair.first;
     const Property::Value& value = pair.second;
 
-    Property::Key matchKey = key;
-    if( matchKey.type == Property::Key::STRING )
-    {
-      if( matchKey == CUSTOM_SHADER )
-      {
-        matchKey = Property::Key( Toolkit::Visual::Property::SHADER );
-      }
-      else if( matchKey == TRANSFORM )
-      {
-        matchKey = Property::Key( Toolkit::Visual::Property::TRANSFORM );
-      }
-      else if( matchKey == PREMULTIPLIED_ALPHA )
-      {
-        matchKey = Property::Key( Toolkit::Visual::Property::PREMULTIPLIED_ALPHA );
-      }
-      else if( matchKey == MIX_COLOR )
-      {
-        matchKey = Property::Key( Toolkit::Visual::Property::MIX_COLOR );
-      }
-      else if( matchKey == OPACITY )
-      {
-        matchKey = Property::Key( Toolkit::Visual::Property::OPACITY );
-      }
-      else if( matchKey == VISUAL_FITTING_MODE )
-      {
-        matchKey = Property::Key( Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE );
-      }
-    }
-
-    switch( matchKey.indexKey )
+    switch(GetVisualPropertyIndex(key))
     {
       case Toolkit::Visual::Property::SHADER:
       {
         Property::Map shaderMap;
-        if( value.Get( shaderMap ) )
+        if(value.Get(shaderMap))
         {
-          SetCustomShader( shaderMap );
+          SetCustomShader(shaderMap);
         }
         break;
       }
@@ -138,9 +226,9 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap )
       case Toolkit::Visual::Property::TRANSFORM:
       {
         Property::Map map;
-        if( value.Get( map ) )
+        if(value.Get(map))
         {
-          mImpl->mTransform.SetPropertyMap( map );
+          mImpl->mTransform.SetPropertyMap(map);
         }
         break;
       }
@@ -148,9 +236,9 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap )
       case Toolkit::Visual::Property::PREMULTIPLIED_ALPHA:
       {
         bool premultipliedAlpha = false;
-        if( value.Get( premultipliedAlpha ) )
+        if(value.Get(premultipliedAlpha))
         {
-          EnablePreMultipliedAlpha( premultipliedAlpha );
+          EnablePreMultipliedAlpha(premultipliedAlpha);
         }
         break;
       }
@@ -158,16 +246,16 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap )
       case Toolkit::Visual::Property::MIX_COLOR:
       {
         Vector4 mixColor;
-        if( value.Get( mixColor ) )
+        if(value.Get(mixColor))
         {
-          if( value.GetType() == Property::VECTOR4 )
+          if(value.GetType() == Property::VECTOR4)
           {
-            SetMixColor( mixColor );
+            SetMixColor(mixColor);
           }
           else
           {
             Vector3 mixColor3(mixColor);
-            SetMixColor( mixColor3 );
+            SetMixColor(mixColor3);
           }
         }
         break;
@@ -175,41 +263,198 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap )
       case Toolkit::Visual::Property::OPACITY:
       {
         float opacity;
-        if( value.Get( opacity ) )
+        if(value.Get(opacity))
         {
           mImpl->mMixColor.a = opacity;
-          SetMixColor( mImpl->mMixColor );
+          SetMixColor(mImpl->mMixColor);
         }
         break;
       }
       case Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE:
       {
-        Scripting::GetEnumerationProperty< Visual::FittingMode >(
-          value, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT, mImpl->mFittingMode );
+        Scripting::GetEnumerationProperty<Visual::FittingMode>(
+          value, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT, mImpl->mFittingMode);
+        break;
+      }
+      case Toolkit::DevelVisual::Property::BORDERLINE_WIDTH:
+      {
+        float width;
+        if(value.Get(width) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(width)))
+        {
+          mImpl->SetBorderlineWidth(width);
+        }
+
+        if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType)))
+        {
+          // Unusual case. SetProperty called after OnInitialize().
+          // Assume that DoAction call UPDATE_PROPERTY.
+          DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBorderlineUniform();
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+
+          // Check whether we must update shader.
+          if(!mImpl->mAlwaysUsingBorderline && IsBorderlineRequired())
+          {
+            // Required to change shader mean, we didn't setup BORDERLINE_COLOR and BORDERLINE_OFFSET into mRenderer before. Set property now.
+            mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+            mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+
+            // Make Blend mode ON_WITHOUT_CULL for transparent mix color.
+            mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL);
+
+            // Change the shader must not be occured many times. we always have to use borderline feature.
+            mImpl->mAlwaysUsingBorderline = true;
+
+            // Change shader
+            if(!mImpl->mCustomShader)
+            {
+              needUpdateShader = true;
+            }
+          }
+        }
+        break;
+      }
+      case Toolkit::DevelVisual::Property::BORDERLINE_COLOR:
+      {
+        Vector4 color;
+        if(value.Get(color) && (mImpl->mDecorationData != nullptr || color != Vector4::ZERO))
+        {
+          mImpl->SetBorderlineColor(color);
+        }
+
+        if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType)))
+        {
+          // Unusual case. SetProperty called after OnInitialize().
+          // Assume that DoAction call UPDATE_PROPERTY.
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+        }
+        break;
+      }
+      case Toolkit::DevelVisual::Property::BORDERLINE_OFFSET:
+      {
+        float offset;
+        if(value.Get(offset) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(offset)))
+        {
+          mImpl->SetBorderlineOffset(offset);
+        }
+
+        if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType)))
+        {
+          // Unusual case. SetProperty called after OnInitialize().
+          // Assume that DoAction call UPDATE_PROPERTY.
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+        }
+        break;
+      }
+      case Toolkit::DevelVisual::Property::CORNER_RADIUS:
+      {
+        if(value.GetType() == Property::VECTOR4)
+        {
+          // If CORNER_RADIUS Property is Vector4,
+          // Each values mean the radius of
+          // (top-left, top-right, bottom-right, bottom-left)
+          Vector4 radius;
+          if(value.Get(radius) && (mImpl->mDecorationData != nullptr || radius != Vector4::ZERO))
+          {
+            mImpl->SetCornerRadius(radius);
+          }
+        }
+        else
+        {
+          // If CORNER_RADIUS Property is float,
+          // Every corner radius have same value
+          float radius;
+          if(value.Get(radius) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(radius)))
+          {
+            mImpl->SetCornerRadius(Vector4(radius, radius, radius, radius));
+          }
+        }
+
+        if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForCornerRadius(mImpl->mType)))
+        {
+          // Unusual case. SetProperty called after OnInitialize().
+          // Assume that DoAction call UPDATE_PROPERTY.
+          DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterCornerRadiusUniform();
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+
+          // Check whether we must update shader.
+          if(!mImpl->mAlwaysUsingCornerRadius && IsRoundedCornerRequired())
+          {
+            // Required to change shader mean, we didn't setup CORNER_RADIUS_POLICY into mRenderer before. Set property now.
+            mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
+
+            // Change the shader must not be occured many times. we always have to use corner radius feature.
+            mImpl->mAlwaysUsingCornerRadius = true;
+
+            if(!IsBorderlineRequired())
+            {
+              // If IsBorderlineRequired is true, BLEND_MODE is already BlendMode::ON_WITHOUT_CULL. So we don't overwrite it.
+              mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+            }
+
+            // Change shader
+            if(!mImpl->mCustomShader)
+            {
+              needUpdateShader = true;
+            }
+          }
+        }
+
+        break;
+      }
+      case Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY:
+      {
+        int policy;
+        if(value.Get(policy))
+        {
+          switch(policy)
+          {
+            case Toolkit::Visual::Transform::Policy::RELATIVE:
+            case Toolkit::Visual::Transform::Policy::ABSOLUTE:
+            {
+              mImpl->SetCornerRadiusPolicy(policy);
+              if(DALI_UNLIKELY(mImpl->mRenderer))
+              {
+                // Unusual case. SetProperty called after OnInitialize().
+                // Assume that DoAction call UPDATE_PROPERTY.
+                mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
+              }
+              break;
+            }
+            default:
+            {
+              DALI_LOG_ERROR("Unsupported policy: %d\n", policy);
+              break;
+            }
+          }
+        }
         break;
       }
     }
   }
 
-  DoSetProperties( propertyMap );
+  DoSetProperties(propertyMap);
+
+  if(DALI_UNLIKELY(needUpdateShader))
+  {
+    UpdateShader();
+  }
 }
 
-void Visual::Base::SetTransformAndSize( const Property::Map& transform, Size controlSize )
+void Visual::Base::SetTransformAndSize(const Property::Map& transform, Size controlSize)
 {
   mImpl->mControlSize = controlSize;
-  mImpl->mTransform.UpdatePropertyMap( transform );
+  mImpl->mTransform.UpdatePropertyMap(transform);
 
 #if defined(DEBUG_ENABLED)
   std::ostringstream oss;
   oss << transform;
-  DALI_LOG_INFO( gVisualBaseLogFilter, Debug::General, "Visual::Base::SetTransformAndSize(%s) - [\e[1;32mtransform: %s  controlSize: (%3.1f, %3.1f)]\e[0m\n",
-                 GetName().c_str(), oss.str().c_str(), controlSize.x, controlSize.y );
+  DALI_LOG_INFO(gVisualBaseLogFilter, Debug::General, "Visual::Base::SetTransformAndSize(%s) - [\e[1;32mtransform: %s  controlSize: (%3.1f, %3.1f)]\e[0m\n", GetName().c_str(), oss.str().c_str(), controlSize.x, controlSize.y);
 #endif
 
   OnSetTransform();
 }
 
-void Visual::Base::SetName( const std::string& name )
+void Visual::Base::SetName(const std::string& name)
 {
   mImpl->mName = name;
 }
@@ -219,46 +464,65 @@ const std::string& Visual::Base::GetName() const
   return mImpl->mName;
 }
 
-float Visual::Base::GetHeightForWidth( float width )
+float Visual::Base::GetHeightForWidth(float width)
 {
-  float aspectCorrectedHeight = 0.f;
+  float   aspectCorrectedHeight = 0.f;
   Vector2 naturalSize;
-  GetNaturalSize( naturalSize );
-  if( naturalSize.width )
+  GetNaturalSize(naturalSize);
+  if(naturalSize.width > 0.0f)
   {
     aspectCorrectedHeight = naturalSize.height * width / naturalSize.width;
   }
   return aspectCorrectedHeight;
 }
 
-float Visual::Base::GetWidthForHeight( float height )
+float Visual::Base::GetWidthForHeight(float height)
 {
-  float aspectCorrectedWidth = 0.f;
+  float   aspectCorrectedWidth = 0.f;
   Vector2 naturalSize;
-  GetNaturalSize( naturalSize );
-  if( naturalSize.height > 0.0f )
+  GetNaturalSize(naturalSize);
+  if(naturalSize.height > 0.0f)
   {
     aspectCorrectedWidth = naturalSize.width * height / naturalSize.height;
   }
   return aspectCorrectedWidth;
 }
 
-void Visual::Base::GetNaturalSize( Vector2& naturalSize )
+void Visual::Base::GetNaturalSize(Vector2& naturalSize)
 {
   naturalSize = Vector2::ZERO;
 }
 
-void Visual::Base::DoAction( const Property::Index actionId, const Property::Value attributes )
+void Visual::Base::DoAction(const Property::Index actionId, const Property::Value attributes)
 {
-  OnDoAction( actionId, attributes );
+  OnDoAction(actionId, attributes);
+
+  // Check if action is valid for this visual type and perform action if possible
+  switch(actionId)
+  {
+    case DevelVisual::Action::UPDATE_PROPERTY:
+    {
+      const Property::Map* map = attributes.GetMap();
+      if(map)
+      {
+        SetProperties(*map);
+      }
+      break;
+    }
+  }
 }
 
-void Visual::Base::SetDepthIndex( int index )
+void Visual::Base::DoActionExtension(const Dali::Property::Index actionId, const Dali::Any attributes)
+{
+  OnDoActionExtension(actionId, attributes);
+}
+
+void Visual::Base::SetDepthIndex(int index)
 {
   mImpl->mDepthIndex = index;
-  if( mImpl->mRenderer )
+  if(mImpl->mRenderer)
   {
-    mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex );
+    mImpl->mRenderer.SetProperty(Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex);
   }
 }
 
@@ -267,78 +531,106 @@ int Visual::Base::GetDepthIndex() const
   return mImpl->mDepthIndex;
 }
 
-void Visual::Base::SetOnStage( Actor& actor )
+void Visual::Base::SetOnScene(Actor& actor)
 {
-  if( !IsOnStage() )
+  if(!IsOnScene())
   {
     // To display the actor correctly, renderer should not be added to actor until all required resources are ready.
     // Thus the calling of actor.AddRenderer() should happen inside derived class as base class does not know the exact timing.
-    DoSetOnStage( actor );
+    DoSetOnScene(actor);
 
-    if( mImpl->mRenderer )
+    if(mImpl->mRenderer)
     {
-      RegisterMixColor();
-
-      mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, IsPreMultipliedAlphaEnabled());
-      mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex );
-      mImpl->mFlags |= Impl::IS_ON_STAGE; // Only sets the flag if renderer exists
+      mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, IsPreMultipliedAlphaEnabled());
+      mImpl->mRenderer.SetProperty(Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex);
     }
+
+    mImpl->mFlags |= Impl::IS_ON_SCENE;
   }
 }
 
-void Visual::Base::SetOffStage( Actor& actor )
+void Visual::Base::SetOffScene(Actor& actor)
 {
-  if( IsOnStage() )
+  if(IsOnScene())
   {
-    DoSetOffStage( actor );
-    mImpl->mMixColorIndex = Property::INVALID_INDEX;
-    mImpl->mFlags &= ~Impl::IS_ON_STAGE;
+    DoSetOffScene(actor);
+    mImpl->mFlags &= ~Impl::IS_ON_SCENE;
   }
 }
 
-void Visual::Base::CreatePropertyMap( Property::Map& map ) const
+void Visual::Base::CreatePropertyMap(Property::Map& map) const
 {
-  DoCreatePropertyMap( map );
+  if(mImpl->mRenderer)
+  {
+    // Update values from Renderer
+    mImpl->mMixColor   = mImpl->mRenderer.GetProperty<Vector3>(VisualRenderer::Property::VISUAL_MIX_COLOR);
+    mImpl->mMixColor.a = mImpl->mRenderer.GetProperty<float>(DevelRenderer::Property::OPACITY);
+
+    mImpl->mTransform.mOffset = mImpl->mRenderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_OFFSET);
+    mImpl->mTransform.mSize   = mImpl->mRenderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_SIZE);
+
+    if(IsRoundedCornerRequired())
+    {
+      mImpl->SetCornerRadius(mImpl->mRenderer.GetProperty<Vector4>(DecoratedVisualRenderer::Property::CORNER_RADIUS));
+    }
+    if(IsBorderlineRequired())
+    {
+      mImpl->SetBorderlineWidth(mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH));
+      mImpl->SetBorderlineColor(mImpl->mRenderer.GetProperty<Vector4>(DecoratedVisualRenderer::Property::BORDERLINE_COLOR));
+      mImpl->SetBorderlineOffset(mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET));
+    }
+  }
+
+  DoCreatePropertyMap(map);
 
-  if( mImpl->mCustomShader )
+  if(mImpl->mCustomShader)
   {
-    mImpl->mCustomShader->CreatePropertyMap( map );
+    mImpl->mCustomShader->CreatePropertyMap(map);
   }
 
   Property::Map transform;
-  mImpl->mTransform.GetPropertyMap( transform );
-  map.Insert( Toolkit::Visual::Property::TRANSFORM, transform );
+  mImpl->mTransform.GetPropertyMap(transform);
+  map.Insert(Toolkit::Visual::Property::TRANSFORM, transform);
 
-  bool premultipliedAlpha( IsPreMultipliedAlphaEnabled() );
-  map.Insert( Toolkit::Visual::Property::PREMULTIPLIED_ALPHA, premultipliedAlpha );
+  bool premultipliedAlpha(IsPreMultipliedAlphaEnabled());
+  map.Insert(Toolkit::Visual::Property::PREMULTIPLIED_ALPHA, premultipliedAlpha);
 
   // Note, Color and Primitive will also insert their own mix color into the map
-  // which is ok, because they have a different key value range.
-  map.Insert( Toolkit::Visual::Property::MIX_COLOR, mImpl->mMixColor ); // vec4
-  map.Insert( Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a );
+  // which is ok, because they have a different key value range, but uses same cached value anyway.
+  map.Insert(Toolkit::Visual::Property::MIX_COLOR, mImpl->mMixColor); // vec4
+  map.Insert(Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a);
 
-  auto fittingModeString = Scripting::GetLinearEnumerationName< FittingMode >(
-    mImpl->mFittingMode, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT );
-  map.Insert( Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE, fittingModeString );
+  auto fittingModeString = Scripting::GetLinearEnumerationName<FittingMode>(
+    mImpl->mFittingMode, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT);
+  map.Insert(Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE, fittingModeString);
+
+  if(IsTypeAvailableForBorderline(mImpl->mType))
+  {
+    map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+    map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+    map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+  }
+
+  if(IsTypeAvailableForCornerRadius(mImpl->mType))
+  {
+    map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+    map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, mImpl->GetCornerRadiusPolicy());
+  }
 }
 
-void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const
+void Visual::Base::CreateInstancePropertyMap(Property::Map& map) const
 {
-  DoCreateInstancePropertyMap( map );
+  DoCreateInstancePropertyMap(map);
 
-  if( mImpl->mCustomShader )
+  if(mImpl->mCustomShader)
   {
-    mImpl->mCustomShader->CreatePropertyMap( map );
+    mImpl->mCustomShader->CreatePropertyMap(map);
   }
-
-  //map.Insert( Toolkit::Visual::Property::DEPTH_INDEX, mImpl->mDepthIndex );
-  //map.Insert( Toolkit::Visual::Property::ENABLED, (bool) mImpl->mRenderer );
 }
 
-
-void Visual::Base::EnablePreMultipliedAlpha( bool preMultiplied )
+void Visual::Base::EnablePreMultipliedAlpha(bool preMultiplied)
 {
-  if( preMultiplied )
+  if(preMultiplied)
   {
     mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
   }
@@ -347,10 +639,10 @@ void Visual::Base::EnablePreMultipliedAlpha( bool preMultiplied )
     mImpl->mFlags &= ~Impl::IS_PREMULTIPLIED_ALPHA;
   }
 
-  if( mImpl->mRenderer )
+  if(mImpl->mRenderer)
   {
     mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, preMultiplied);
-    mImpl->mRenderer.RegisterProperty( PRE_MULTIPLIED_ALPHA_PROPERTY, static_cast<float>( preMultiplied ) );
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA, preMultiplied);
   }
 }
 
@@ -359,109 +651,178 @@ bool Visual::Base::IsPreMultipliedAlphaEnabled() const
   return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA;
 }
 
-void Visual::Base::DoSetOffStage( Actor& actor )
+void Visual::Base::DoSetOffScene(Actor& actor)
 {
-  actor.RemoveRenderer( mImpl->mRenderer );
-  mImpl->mRenderer.Reset();
+  actor.RemoveRenderer(mImpl->mRenderer);
 }
 
-bool Visual::Base::IsOnStage() const
+bool Visual::Base::IsOnScene() const
 {
-  return mImpl->mFlags & Impl::IS_ON_STAGE;
+  return mImpl->mFlags & Impl::IS_ON_SCENE;
 }
 
-void Visual::Base::OnDoAction( const Property::Index actionId, const Property::Value& attributes )
+bool Visual::Base::IsRoundedCornerRequired() const
 {
-  // May be overriden by derived class
+  // If VisualType doesn't support rounded corner, always return false.
+  if(IsTypeAvailableForCornerRadius(mImpl->mType))
+  {
+    if(mImpl->mRenderer)
+    {
+      // Update values from Renderer
+      Property::Value value = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS);
+
+      Vector4 retValue = Vector4::ZERO;
+      if(value.Get(retValue))
+      {
+        if(mImpl->mDecorationData != nullptr || retValue != Vector4::ZERO)
+        {
+          mImpl->SetCornerRadius(retValue);
+        }
+      }
+    }
+    return mImpl->mAlwaysUsingCornerRadius || !(mImpl->GetCornerRadius() == Vector4::ZERO);
+  }
+  return false;
 }
 
-void Visual::Base::RegisterMixColor()
+bool Visual::Base::IsBorderlineRequired() const
 {
-  // Only register if not already registered.
-  // (Color and Primitive visuals will register their own and save to this index)
-  if( mImpl->mMixColorIndex == Property::INVALID_INDEX )
+  // If VisualType doesn't support borderline, always return false.
+  if(IsTypeAvailableForBorderline(mImpl->mType))
   {
-    mImpl->mMixColorIndex = DevelHandle::RegisterProperty(
-      mImpl->mRenderer,
-      Toolkit::Visual::Property::MIX_COLOR,
-      MIX_COLOR,
-      Vector3(mImpl->mMixColor) );
+    if(mImpl->mRenderer)
+    {
+      // Update values from Renderer
+      Property::Value value = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH);
+
+      float retValue = 0.0f;
+      if(value.Get(retValue))
+      {
+        if(mImpl->mDecorationData != nullptr || !Dali::EqualsZero(retValue))
+        {
+          mImpl->SetBorderlineWidth(retValue);
+        }
+      }
+    }
+    return mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->GetBorderlineWidth());
   }
+  return false;
+}
 
-  if( mImpl->mMixColor.a < 1.f )
+void Visual::Base::OnDoAction(const Property::Index actionId, const Property::Value& attributes)
+{
+  // May be overriden by derived class
+}
+
+void Visual::Base::OnDoActionExtension(const Property::Index actionId, const Dali::Any attributes)
+{
+  // May be overriden by derived class
+}
+
+void Visual::Base::RegisterMixColor()
+{
+  if(mImpl->mRenderer)
   {
-    mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
-  }
+    // All visual renderers now use same mix color / opacity properties.
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(mImpl->mMixColor));
+    mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, mImpl->mMixColor.a);
 
-  mImpl->mRenderer.SetProperty( DevelRenderer::Property::OPACITY, mImpl->mMixColor.a );
+    float preMultipliedAlpha = 0.0f;
+    if(IsPreMultipliedAlphaEnabled())
+    {
+      preMultipliedAlpha = 1.0f;
+    }
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA, preMultipliedAlpha);
+  }
+}
 
-  float preMultipliedAlpha = 0.0f;
-  if( IsPreMultipliedAlphaEnabled() )
+void Visual::Base::RegisterDecoration()
+{
+  if(mImpl->mRenderer)
   {
-    preMultipliedAlpha = 1.0f;
+    if(IsTypeAvailableForCornerRadius(mImpl->mType))
+    {
+      if(mImpl->mAlwaysUsingCornerRadius || !(mImpl->GetCornerRadius() == Vector4::ZERO))
+      {
+        DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterCornerRadiusUniform();
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
+      }
+    }
+    if(IsTypeAvailableForBorderline(mImpl->mType))
+    {
+      if(mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->GetBorderlineWidth()))
+      {
+        DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBorderlineUniform();
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+      }
+    }
   }
-  mImpl->mRenderer.RegisterProperty( PRE_MULTIPLIED_ALPHA_PROPERTY, preMultipliedAlpha );
 }
 
-void Visual::Base::SetMixColor( const Vector4& color )
+void Visual::Base::SetMixColor(const Vector4& color)
 {
   mImpl->mMixColor = color;
 
-  if( mImpl->mRenderer )
+  if(mImpl->mRenderer)
   {
-    mImpl->mRenderer.SetProperty( mImpl->mMixColorIndex, Vector3(color) );
-    mImpl->mRenderer.SetProperty( DevelRenderer::Property::OPACITY, color.a );
-    if( color.a < 1.f )
-    {
-      mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
-    }
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(color));
+    mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, color.a);
   }
 }
 
-void Visual::Base::SetMixColor( const Vector3& color )
+void Visual::Base::SetMixColor(const Vector3& color)
 {
   mImpl->mMixColor.r = color.r;
   mImpl->mMixColor.g = color.g;
   mImpl->mMixColor.b = color.b;
 
-  if( mImpl->mRenderer )
+  if(mImpl->mRenderer)
   {
-    mImpl->mRenderer.SetProperty( mImpl->mMixColorIndex, color );
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, color);
   }
 }
 
-const Vector4& Visual::Base::GetMixColor() const
+void Visual::Base::AddEventObserver(Visual::EventObserver& observer)
 {
-  return mImpl->mMixColor;
+  mImpl->mEventObserver = &observer;
 }
 
-void Visual::Base::AddResourceObserver( Visual::ResourceObserver& observer)
+void Visual::Base::RemoveEventObserver(Visual::EventObserver& observer)
 {
-  mImpl->mResourceObserver = &observer;
-}
-
-void Visual::Base::RemoveResourceObserver( Visual::ResourceObserver& observer )
-{
-  mImpl->mResourceObserver = NULL;
+  mImpl->mEventObserver = NULL;
 }
 
 void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus)
 {
-  if( mImpl->mResourceStatus != resourceStatus )
+  if(mImpl->mResourceStatus != resourceStatus)
   {
     mImpl->mResourceStatus = resourceStatus;
 
-    if( mImpl->mResourceObserver )
+    if(mImpl->mEventObserver)
     {
       // observer is currently a control impl
-      mImpl->mResourceObserver->ResourceReady( *this );
+      mImpl->mEventObserver->ResourceReady(*this);
     }
   }
 }
 
 bool Visual::Base::IsResourceReady() const
 {
-  return ( mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY );
+  return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY ||
+          mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED);
+}
+
+bool Visual::Base::IsSynchronousLoadingRequired() const
+{
+  return (mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING);
+}
+
+Toolkit::Visual::Type Visual::Base::GetType() const
+{
+  return mImpl->mType;
 }
 
 Toolkit::Visual::ResourceStatus Visual::Base::GetResourceStatus() const
@@ -484,24 +845,155 @@ Renderer Visual::Base::GetRenderer()
   return mImpl->mRenderer;
 }
 
-Property::Index Visual::Base::GetPropertyIndex( Property::Key key )
+Property::Index Visual::Base::GetIntKey(Property::Key key)
 {
-  Property::Index index = DevelHandle::GetPropertyIndex( mImpl->mRenderer, key );
+  if(key.type == Property::Key::INDEX)
+  {
+    return key.indexKey;
+  }
+
+  if(key.stringKey == ANCHOR_POINT)
+  {
+    return Toolkit::Visual::Transform::Property::ANCHOR_POINT;
+  }
+  else if(key.stringKey == EXTRA_SIZE)
+  {
+    return Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE;
+  }
+  else if(key.stringKey == MIX_COLOR)
+  {
+    return Toolkit::Visual::Property::MIX_COLOR;
+  }
+  else if(key.stringKey == OPACITY)
+  {
+    return Toolkit::Visual::Property::OPACITY;
+  }
+  else if(key.stringKey == OFFSET)
+  {
+    return Toolkit::Visual::Transform::Property::OFFSET;
+  }
+  else if(key.stringKey == OFFSET_POLICY)
+  {
+    return Toolkit::Visual::Transform::Property::OFFSET_POLICY;
+  }
+  else if(key.stringKey == ORIGIN)
+  {
+    return Toolkit::Visual::Transform::Property::ORIGIN;
+  }
+  else if(key.stringKey == PREMULTIPLIED_ALPHA)
+  {
+    return Toolkit::Visual::Property::PREMULTIPLIED_ALPHA;
+  }
+  else if(key.stringKey == CUSTOM_SHADER)
+  {
+    return Toolkit::Visual::Property::SHADER;
+  }
+  else if(key.stringKey == SIZE)
+  {
+    return Toolkit::Visual::Transform::Property::SIZE;
+  }
+  else if(key.stringKey == SIZE_POLICY)
+  {
+    return Toolkit::Visual::Transform::Property::SIZE_POLICY;
+  }
+  else if(key.stringKey == TRANSFORM)
+  {
+    return Toolkit::Visual::Property::TRANSFORM;
+  }
+  else if(key.stringKey == VISUAL_FITTING_MODE)
+  {
+    return Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE;
+  }
+  else if(key.stringKey == CORNER_RADIUS)
+  {
+    return Toolkit::DevelVisual::Property::CORNER_RADIUS;
+  }
+  else if(key.stringKey == CORNER_RADIUS_POLICY)
+  {
+    return Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY;
+  }
+  else if(key.stringKey == BORDERLINE_WIDTH)
+  {
+    return Toolkit::DevelVisual::Property::BORDERLINE_WIDTH;
+  }
+  else if(key.stringKey == BORDERLINE_COLOR)
+  {
+    return Toolkit::DevelVisual::Property::BORDERLINE_COLOR;
+  }
+  else if(key.stringKey == BORDERLINE_OFFSET)
+  {
+    return Toolkit::DevelVisual::Property::BORDERLINE_OFFSET;
+  }
+
+  return Property::INVALID_INDEX;
+}
 
-  if( index == Property::INVALID_INDEX )
+Property::Index Visual::Base::GetPropertyIndex(Property::Key key)
+{
+  switch(GetIntKey(key))
+  {
+    case Dali::Toolkit::Visual::Transform::Property::OFFSET:
+    {
+      return VisualRenderer::Property::TRANSFORM_OFFSET;
+    }
+    case Dali::Toolkit::Visual::Transform::Property::SIZE:
+    {
+      return VisualRenderer::Property::TRANSFORM_SIZE;
+    }
+    case Dali::Toolkit::Visual::Transform::Property::ORIGIN:
+    {
+      return VisualRenderer::Property::TRANSFORM_ORIGIN;
+    }
+    case Dali::Toolkit::Visual::Transform::Property::ANCHOR_POINT:
+    {
+      return VisualRenderer::Property::TRANSFORM_ANCHOR_POINT;
+    }
+    case Dali::Toolkit::Visual::Property::MIX_COLOR:
+    {
+      return VisualRenderer::Property::VISUAL_MIX_COLOR;
+    }
+    case Dali::Toolkit::Visual::Property::OPACITY:
+    {
+      return DevelRenderer::Property::OPACITY;
+    }
+    case Dali::Toolkit::Visual::Property::PREMULTIPLIED_ALPHA:
+    {
+      return VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA;
+    }
+    case Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS:
+    {
+      return DecoratedVisualRenderer::Property::CORNER_RADIUS;
+    }
+    case Dali::Toolkit::DevelVisual::Property::BORDERLINE_WIDTH:
+    {
+      return DecoratedVisualRenderer::Property::BORDERLINE_WIDTH;
+    }
+    case Dali::Toolkit::DevelVisual::Property::BORDERLINE_COLOR:
+    {
+      return DecoratedVisualRenderer::Property::BORDERLINE_COLOR;
+    }
+    case Dali::Toolkit::DevelVisual::Property::BORDERLINE_OFFSET:
+    {
+      return DecoratedVisualRenderer::Property::BORDERLINE_OFFSET;
+    }
+  }
+
+  Property::Index index = mImpl->mRenderer.GetPropertyIndex(key);
+
+  if(index == Property::INVALID_INDEX)
   {
     // Is it a shader property?
     Shader shader = mImpl->mRenderer.GetShader();
-    index = DevelHandle::GetPropertyIndex( shader, key );
-    if( index != Property::INVALID_INDEX )
+    index         = shader.GetPropertyIndex(key);
+    if(index != Property::INVALID_INDEX)
     {
       // Yes - we should register it in the Renderer so it can be set / animated
       // independently, as shaders are shared across multiple renderers.
-      std::string keyName;
-      Property::Index keyIndex( Property::INVALID_KEY );
-      if( key.type == Property::Key::INDEX )
+      std::string     keyName;
+      Property::Index keyIndex(Property::INVALID_KEY);
+      if(key.type == Property::Key::INDEX)
       {
-        keyName = shader.GetPropertyName( index );
+        keyName  = shader.GetPropertyName(index);
         keyIndex = key.indexKey;
       }
       else
@@ -509,229 +1001,291 @@ Property::Index Visual::Base::GetPropertyIndex( Property::Key key )
         keyName = key.stringKey;
         // Leave keyIndex as INVALID_KEY - it can still be registered against the string key.
       }
-      Property::Value value = shader.GetProperty( index );
-      index = DevelHandle::RegisterProperty( mImpl->mRenderer, keyIndex, keyName, value );
+      Property::Value value = shader.GetProperty(index);
+
+      // We already know that mRenderer didn't have property. So we can assume that it is unique.
+      index = mImpl->mRenderer.RegisterUniqueProperty(keyIndex, keyName, value);
     }
   }
   return index;
 }
 
 void Visual::Base::SetupTransition(
-  Dali::Animation& transition,
+  Dali::Animation&                    transition,
   Internal::TransitionData::Animator& animator,
-  Property::Index index,
-  Property::Value& initialValue,
-  Property::Value& targetValue )
+  Property::Index                     index,
+  Property::Value&                    initialValue,
+  Property::Value&                    targetValue)
 {
-  if( index != Property::INVALID_INDEX )
+  if(index != Property::INVALID_INDEX)
   {
-    if( mImpl->mRenderer )
+    if(mImpl->mRenderer)
     {
-      if( animator.animate == false )
+      if(animator.animate == false)
       {
-        mImpl->mRenderer.SetProperty( index, targetValue );
+        mImpl->mRenderer.SetProperty(index, targetValue);
       }
       else
       {
-        if( animator.initialValue.GetType() != Property::NONE )
+        if(animator.initialValue.GetType() != Property::NONE)
         {
-          mImpl->mRenderer.SetProperty( index, initialValue );
+          mImpl->mRenderer.SetProperty(index, initialValue);
         }
 
-        if( ! transition )
+        if(!transition)
         {
-          transition = Dali::Animation::New( 0.1f );
+          transition = Dali::Animation::New(0.1f);
         }
 
-        transition.AnimateTo( Property( mImpl->mRenderer, index ),
-                              targetValue,
-                              animator.alphaFunction,
-                              TimePeriod( animator.timePeriodDelay,
-                                          animator.timePeriodDuration ) );
+        transition.AnimateTo(Property(mImpl->mRenderer, index),
+                             targetValue,
+                             animator.alphaFunction,
+                             TimePeriod(animator.timePeriodDelay,
+                                        animator.timePeriodDuration));
       }
     }
   }
 }
 
 void Visual::Base::AnimateProperty(
-  Dali::Animation& transition,
-  Internal::TransitionData::Animator& animator )
+  Dali::Animation&                    transition,
+  Internal::TransitionData::Animator& animator)
 {
 #if defined(DEBUG_ENABLED)
+  if(gVisualBaseLogFilter->IsEnabledFor(Debug::General))
   {
     std::ostringstream oss;
     oss << "Visual::Base::AnimateProperty(Visual:" << mImpl->mName << " Property:" << animator.propertyKey << " Target: " << animator.targetValue << std::endl;
-    DALI_LOG_INFO( gVisualBaseLogFilter, Debug::General, oss.str().c_str() );
+    DALI_LOG_INFO(gVisualBaseLogFilter, Debug::General, oss.str().c_str());
   }
 #endif
 
-  Property::Map map;
-  DoCreatePropertyMap( map );
-  Property::Value* valuePtr = map.Find( Toolkit::Visual::Property::TYPE );
-  int visualType = -1;
-  if( valuePtr )
+  if(animator.propertyKey == Toolkit::Visual::Property::MIX_COLOR ||
+     animator.propertyKey == MIX_COLOR ||
+     (mImpl->mType == Toolkit::Visual::COLOR &&
+      animator.propertyKey == ColorVisual::Property::MIX_COLOR) ||
+     (mImpl->mType == Toolkit::Visual::PRIMITIVE &&
+      animator.propertyKey == PrimitiveVisual::Property::MIX_COLOR))
   {
-    valuePtr->Get( visualType );
-  }
-
-  if( animator.propertyKey == Toolkit::Visual::Property::MIX_COLOR ||
-      animator.propertyKey == MIX_COLOR ||
-      ( visualType == Toolkit::Visual::COLOR &&
-        animator.propertyKey == ColorVisual::Property::MIX_COLOR ) ||
-      ( visualType == Toolkit::Visual::PRIMITIVE &&
-        animator.propertyKey == PrimitiveVisual::Property::MIX_COLOR ) )
-  {
-    AnimateMixColorProperty( transition, animator );
+    AnimateMixColorProperty(transition, animator);
   }
   else if(animator.propertyKey == Toolkit::Visual::Property::OPACITY ||
-          animator.propertyKey == OPACITY )
+          animator.propertyKey == OPACITY)
   {
-    AnimateOpacityProperty( transition, animator );
+    AnimateOpacityProperty(transition, animator);
   }
-  else if( mImpl->mRenderer )
+  else if(mImpl->mRenderer)
   {
-    AnimateRendererProperty( transition, animator );
+    AnimateRendererProperty(transition, animator);
   }
 }
 
 void Visual::Base::AnimateOpacityProperty(
-  Dali::Animation& transition,
-  Internal::TransitionData::Animator& animator )
+  Dali::Animation&                    transition,
+  Internal::TransitionData::Animator& animator)
 {
-  bool isOpaque = mImpl->mMixColor.a >= 1.0f;
-
-  float initialOpacity;
-  if( animator.initialValue.Get( initialOpacity ) )
-  {
-    isOpaque = (initialOpacity >= 1.0f);
-  }
-
   float targetOpacity;
-  if( animator.targetValue.Get( targetOpacity ) )
+  if(animator.targetValue.Get(targetOpacity))
   {
     mImpl->mMixColor.a = targetOpacity;
   }
 
-  SetupTransition( transition, animator, DevelRenderer::Property::OPACITY, animator.initialValue, animator.targetValue );
-  SetupBlendMode( transition, isOpaque, animator.animate );
+  SetupTransition(transition, animator, DevelRenderer::Property::OPACITY, animator.initialValue, animator.targetValue);
 }
 
 void Visual::Base::AnimateRendererProperty(
-  Dali::Animation& transition,
-  Internal::TransitionData::Animator& animator )
+  Dali::Animation&                    transition,
+  Internal::TransitionData::Animator& animator)
 {
-  Property::Index index = GetPropertyIndex( animator.propertyKey );
-  if( index != Property::INVALID_INDEX )
+  // Get actual renderer index (will convert transform keys into visualproperty indices)
+  Property::Index index = GetPropertyIndex(animator.propertyKey);
+
+  if(index != Property::INVALID_INDEX)
   {
-    if( animator.targetValue.GetType() != Property::NONE )
+    if(animator.targetValue.GetType() != Property::NONE)
     {
       // Try writing target value into transform property map
       // if it's not a valid key, then it won't alter mTransform
       Property::Map map;
-      if( animator.propertyKey.type == Property::Key::INDEX )
+      if(animator.propertyKey.type == Property::Key::INDEX)
       {
-        map.Add( animator.propertyKey.indexKey, animator.targetValue );
+        map.Add(animator.propertyKey.indexKey, animator.targetValue);
       }
       else
       {
-        map.Add( animator.propertyKey.stringKey, animator.targetValue );
+        map.Add(animator.propertyKey.stringKey, animator.targetValue);
       }
 
-      mImpl->mTransform.UpdatePropertyMap( map );
+      mImpl->mTransform.UpdatePropertyMap(map);
     }
-
-    SetupTransition( transition, animator, index, animator.initialValue, animator.targetValue );
+    SetupTransition(transition, animator, index, animator.initialValue, animator.targetValue);
   }
 }
 
 void Visual::Base::AnimateMixColorProperty(
-  Dali::Animation& transition,
-  Internal::TransitionData::Animator& animator )
+  Dali::Animation&                    transition,
+  Internal::TransitionData::Animator& animator)
 {
-  Property::Index index = mImpl->mMixColorIndex;
   bool animateOpacity = false;
-  bool isOpaque = true;
 
   Property::Value initialOpacity;
   Property::Value targetOpacity;
   Property::Value initialMixColor;
   Property::Value targetMixColor;
 
-  if( index != Property::INVALID_INDEX )
+  Vector4 initialColor;
+  if(animator.initialValue.Get(initialColor))
   {
-    Vector4 initialColor;
-    if( animator.initialValue.Get(initialColor) )
+    if(animator.initialValue.GetType() == Property::VECTOR4)
     {
-      if( animator.initialValue.GetType() == Property::VECTOR4 )
-      {
-        // if there is an initial color specifying alpha, test it
-        isOpaque = initialColor.a >= 1.0f;
-        initialOpacity = initialColor.a;
-      }
-      initialMixColor = Vector3( initialColor );
+      // if there is an initial color specifying alpha, test it
+      initialOpacity = initialColor.a;
     }
+    initialMixColor = Vector3(initialColor);
+  }
 
-    // Set target value into data store
-    if( animator.targetValue.GetType() != Property::NONE )
+  // Set target value into data store
+  if(animator.targetValue.GetType() != Property::NONE)
+  {
+    Vector4 mixColor;
+    animator.targetValue.Get(mixColor);
+    if(animator.targetValue.GetType() == Property::VECTOR4)
     {
-      Vector4 mixColor;
-      animator.targetValue.Get(mixColor);
-      if( animator.targetValue.GetType() == Property::VECTOR4 )
-      {
-        mImpl->mMixColor.a = mixColor.a;
-        targetOpacity = mixColor.a;
-        animateOpacity = true;
-      }
-
-      mImpl->mMixColor.r = mixColor.r;
-      mImpl->mMixColor.g = mixColor.g;
-      mImpl->mMixColor.b = mixColor.b;
-      targetMixColor = Vector3(mixColor);
+      mImpl->mMixColor.a = mixColor.a;
+      targetOpacity      = mixColor.a;
+      animateOpacity     = true;
     }
 
-    SetupTransition( transition, animator, index, initialMixColor, targetMixColor );
-    if( animateOpacity )
-    {
-      SetupTransition( transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity );
-      SetupBlendMode( transition, isOpaque, animator.animate );
-    }
+    mImpl->mMixColor.r = mixColor.r;
+    mImpl->mMixColor.g = mixColor.g;
+    mImpl->mMixColor.b = mixColor.b;
+    targetMixColor     = Vector3(mixColor);
+  }
+
+  SetupTransition(transition, animator, VisualRenderer::Property::VISUAL_MIX_COLOR, initialMixColor, targetMixColor);
+
+  if(animateOpacity)
+  {
+    SetupTransition(transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity);
   }
 }
 
-void Visual::Base::SetupBlendMode( Animation& transition, bool isInitialOpaque, bool animating )
+Dali::Property Visual::Base::GetPropertyObject(Dali::Property::Key key)
 {
-  // Ensure the blend mode is turned on if we are animating opacity, and
-  // turned off after the animation ends if the final value is opaque
-  if( ! isInitialOpaque || mImpl->mMixColor.a < 1.0f )
+  if(!mImpl->mRenderer)
   {
-    if( mImpl->mRenderer )
+    Handle handle;
+    return Dali::Property(handle, Property::INVALID_INDEX);
+  }
+
+  switch(GetIntKey(key))
+  {
+    // Default animatable properties from VisualRenderer
+    case Toolkit::Visual::Property::MIX_COLOR:
+    {
+      return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR);
+    }
+    case Toolkit::Visual::Property::OPACITY:
     {
-      mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
+      return Dali::Property(mImpl->mRenderer, DevelRenderer::Property::OPACITY);
+    }
+    case Toolkit::Visual::Transform::Property::OFFSET:
+    {
+      return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::TRANSFORM_OFFSET);
+    }
+    case Toolkit::Visual::Transform::Property::SIZE:
+    {
+      return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::TRANSFORM_SIZE);
+    }
 
-      if( animating == true && mImpl->mMixColor.a >= 1.0f )
+    // Default animatable properties from DecoratedVisualRenderer
+    case Toolkit::DevelVisual::Property::CORNER_RADIUS:
+    {
+      if(IsTypeAvailableForCornerRadius(mImpl->mType))
       {
-        // When it becomes opaque, set the blend mode back to automatically
-        if( ! mImpl->mBlendSlotDelegate )
+        const bool updateShader = !mImpl->mCustomShader && !IsRoundedCornerRequired();
+
+        // CornerRadius is animated now. we always have to use corner radius feature.
+        mImpl->mAlwaysUsingCornerRadius = true;
+
+        if(updateShader)
         {
-          mImpl->mBlendSlotDelegate = new SlotDelegate<Visual::Base>(this);
+          // Update each values to renderer
+          DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterCornerRadiusUniform();
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
+
+          // Change shader
+          UpdateShader();
         }
-        transition.FinishedSignal().Connect( *(mImpl->mBlendSlotDelegate),
-                                             &Visual::Base::OnMixColorFinished );
+        if(!IsBorderlineRequired())
+        {
+          // If IsBorderlineRequired is true, BLEND_MODE is already BlendMode::ON_WITHOUT_CULL. So we don't overwrite it.
+          mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+        }
+        return Dali::Property(mImpl->mRenderer, DecoratedVisualRenderer::Property::CORNER_RADIUS);
+      }
+      break;
+    }
+    case Toolkit::DevelVisual::Property::BORDERLINE_WIDTH:
+    case Toolkit::DevelVisual::Property::BORDERLINE_COLOR:
+    case Toolkit::DevelVisual::Property::BORDERLINE_OFFSET:
+    {
+      if(IsTypeAvailableForBorderline(mImpl->mType))
+      {
+        const bool updateShader = !mImpl->mCustomShader && !IsBorderlineRequired();
+
+        // Borderline is animated now. we always have to use borderline feature.
+        mImpl->mAlwaysUsingBorderline = true;
+
+        if(updateShader)
+        {
+          // Update each values to renderer
+          DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBorderlineUniform();
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+
+          // Change shader
+          UpdateShader();
+        }
+        mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL);
+
+        return Dali::Property(mImpl->mRenderer, GetPropertyIndex(key));
+      }
+      break;
+    }
+    default:
+    {
+      // Special case for MIX_COLOR
+      if(key.type == Property::Key::INDEX &&
+         ((mImpl->mType == Toolkit::Visual::COLOR && key.indexKey == ColorVisual::Property::MIX_COLOR) ||
+          (mImpl->mType == Toolkit::Visual::PRIMITIVE && key.indexKey == PrimitiveVisual::Property::MIX_COLOR)))
+      {
+        return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR);
+      }
+
+      // Special case for BLUR_RADIUS
+      if(mImpl->mType == Toolkit::Visual::COLOR &&
+         ((key.type == Property::Key::INDEX && key.indexKey == DevelColorVisual::Property::BLUR_RADIUS) ||
+          (key.type == Property::Key::STRING && key.stringKey == BLUR_RADIUS_NAME)))
+      {
+        // Request to color-visual class
+        return OnGetPropertyObject(key);
       }
     }
   }
-}
 
-void Visual::Base::OnMixColorFinished( Animation& animation )
-{
-  if( mImpl->mRenderer )
+  // If it is not VisualRenderer property, check registered Renderer and Shader property.
+  Property::Index index = GetPropertyIndex(key);
+  if(index != Property::INVALID_INDEX)
   {
-    DALI_LOG_INFO( gVisualBaseLogFilter, Debug::General, "Visual::Base::OnMixColorFinished()\n");
-    mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE,
-                                  ( mImpl->mMixColor.a < 1.0 ) ? BlendMode::ON : BlendMode::AUTO );
+    return Dali::Property(mImpl->mRenderer, index);
   }
-  delete mImpl->mBlendSlotDelegate;
-  mImpl->mBlendSlotDelegate = NULL;
+
+  // We can't find the property in the base class.
+  // Request to child class
+  return OnGetPropertyObject(key);
 }
 
 } // namespace Internal