X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fanimation%2Fscene-graph-constraint-base.cpp;h=9a692ddbdf8bd4424bed57bf0f5ff65bb6a31919;hb=e2ee93d144c63abb914c086281d09c40b213919f;hp=19b0373dc9267502f8ad120e79ac2761214cd604;hpb=fc36200990ceb8d4c56f592c3fa862b66f79636a;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/update/animation/scene-graph-constraint-base.cpp b/dali/internal/update/animation/scene-graph-constraint-base.cpp
index 19b0373..9a692dd 100644
--- a/dali/internal/update/animation/scene-graph-constraint-base.cpp
+++ b/dali/internal/update/animation/scene-graph-constraint-base.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -18,9 +18,6 @@
 // CLASS HEADER
 #include <dali/internal/update/animation/scene-graph-constraint.h>
 
-// INTERNAL INCLUDES
-#include <dali/public-api/animation/active-constraint.h>
-
 namespace Dali
 {
 
@@ -35,9 +32,8 @@ namespace SceneGraph
   unsigned int ConstraintBase::mTotalInstanceCount   = 0;
 #endif
 
-ConstraintBase::ConstraintBase( PropertyOwnerSet& ownerSet )
-: mWeight( Dali::ActiveConstraint::DEFAULT_WEIGHT ),
-  mRemoveAction( Dali::Constraint::DEFAULT_REMOVE_ACTION ),
+ConstraintBase::ConstraintBase( PropertyOwnerContainer& ownerSet, RemoveAction removeAction )
+: mRemoveAction( removeAction ),
   mFirstApply( true ),
   mDisconnected( true ),
   mObservedOwners( ownerSet )
@@ -57,15 +53,11 @@ ConstraintBase::~ConstraintBase()
 
 #ifdef DEBUG_ENABLED
   --mCurrentInstanceCount;
-#ifndef EMSCRIPTEN
-  memset ( &mWeight, 0xFA, sizeof(mWeight) ); // Fill with garbage pattern to help detect invalid memory access
-#endif
 #endif
 }
 
 void ConstraintBase::ResetDefaultProperties( BufferIndex updateBufferIndex )
 {
-  // Not used, since the weight property is reset by PropertyOwner
   DALI_ASSERT_DEBUG( false );
 }