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-data-impl.cpp;h=fc962bd9284da471c0c37c1b0cf048ff14f9145d;hp=4bb7634066fc4267ce66e0bd89f9abbecf794ac1;hb=798ef5fa1591aa78851e9e3d08fe37411192176a;hpb=db55bbae40d7e8ca111060417ca9d3ccd1151018

diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index 4bb7634..fc962bd 100644
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@ -95,7 +95,7 @@ bool GetPolicyFromValue( const Property::Value& value, Vector2& policy )
   }
   else
   {
-    Property::Array* array = value.GetArray();
+    const Property::Array* array = value.GetArray();
     if( array && array->Size() == 2 )
     {
       Toolkit::Visual::Transform::Policy::Type xPolicy = static_cast< Toolkit::Visual::Transform::Policy::Type >( -1 ); // Assign an invalid value so definitely changes
@@ -115,27 +115,28 @@ bool GetPolicyFromValue( const Property::Value& value, Vector2& policy )
 
 } // unnamed namespace
 
-Internal::Visual::Base::Impl::Impl(FittingMode fittingMode)
-: mCustomShader( NULL ),
-  mBlendSlotDelegate( NULL ),
-  mEventObserver( NULL ),
+Internal::Visual::Base::Impl::Impl(FittingMode fittingMode, Toolkit::Visual::Type type)
+: mCustomShader(NULL),
+  mEventObserver(NULL),
   mTransform(),
-  mMixColor( Color::WHITE ),
-  mControlSize( Vector2::ZERO ),
-  mCornerRadius( 0.0f ),
-  mDepthIndex( 0.0f ),
-  mMixColorIndex( Property::INVALID_INDEX ),
-  mCornerRadiusIndex( Property::INVALID_INDEX ),
-  mFittingMode( fittingMode ),
-  mFlags( 0 ),
-  mResourceStatus( Toolkit::Visual::ResourceStatus::PREPARING )
+  mMixColor(Color::WHITE),
+  mControlSize(Vector2::ZERO),
+  mCornerRadius(0.0f),
+  mCornerRadiusPolicy(1.0f),
+  mDepthIndex(0.0f),
+  mMixColorIndex(Property::INVALID_INDEX),
+  mCornerRadiusIndex(Property::INVALID_INDEX),
+  mFittingMode(fittingMode),
+  mFlags(0),
+  mResourceStatus(Toolkit::Visual::ResourceStatus::PREPARING),
+  mType(type),
+  mNeedCornerRadius(false)
 {
 }
 
 Internal::Visual::Base::Impl::~Impl()
 {
   delete mCustomShader;
-  delete mBlendSlotDelegate;
 }
 
 Internal::Visual::Base::Impl::CustomShader::CustomShader( const Property::Map& map )