[dali_2.3.21] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / visual-base-data-impl.cpp

diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index 2616b2a..b3d8201 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@ -115,21 +115,13 @@ bool GetPolicyFromValue(const Property::Value& value, Vector2& policy)
 } // unnamed namespace
 
 Internal::Visual::Base::Impl::Impl(FittingMode fittingMode, Toolkit::Visual::Type type)
-: mCustomShader(NULL),
-  mEventObserver(NULL),
+: mCustomShader(nullptr),
+  mEventObserver(nullptr),
   mTransform(),
   mMixColor(Color::WHITE),
   mControlSize(Vector2::ZERO),
-  mBorderlineWidth(0.0f),
-  mBorderlineColor(Color::BLACK),
-  mBorderlineOffset(0.0f),
-  mCornerRadius(Vector4::ZERO),
-  mCornerRadiusPolicy(1.0f),
+  mDecorationData(nullptr),
   mDepthIndex(0.0f),
-  mBorderlineWidthIndex(Property::INVALID_INDEX),
-  mBorderlineColorIndex(Property::INVALID_INDEX),
-  mBorderlineOffsetIndex(Property::INVALID_INDEX),
-  mCornerRadiusIndex(Property::INVALID_INDEX),
   mFittingMode(fittingMode),
   mFlags(0),
   mResourceStatus(Toolkit::Visual::ResourceStatus::PREPARING),
@@ -142,6 +134,10 @@ Internal::Visual::Base::Impl::Impl(FittingMode fittingMode, Toolkit::Visual::Typ
 Internal::Visual::Base::Impl::~Impl()
 {
   delete mCustomShader;
+  if(mDecorationData)
+  {
+    delete mDecorationData;
+  }
 }
 
 Internal::Visual::Base::Impl::CustomShader::CustomShader(const Property::Map& map)