Remove current and future memory leaks with messages by forcing the use of OwnerPoint...

[platform/core/uifw/dali-core.git] / dali / internal / update / animation / scene-graph-constraint-base.cpp

diff --git a/dali/internal/update/animation/scene-graph-constraint-base.cpp b/dali/internal/update/animation/scene-graph-constraint-base.cpp
index c79e39d..9a692dd 100644 (file)
--- a/dali/internal/update/animation/scene-graph-constraint-base.cpp
+++ b/dali/internal/update/animation/scene-graph-constraint-base.cpp
@@ -1,25 +1,23 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/internal/update/animation/scene-graph-constraint.h>
 
-// INTERNAL INCLUDES
-#include <dali/public-api/animation/active-constraint.h>
-
 namespace Dali
 {
 
@@ -29,13 +27,21 @@ namespace Internal
 namespace SceneGraph
 {
 
-ConstraintBase::ConstraintBase( PropertyOwnerSet& ownerSet )
-: mWeight( Dali::ActiveConstraint::DEFAULT_WEIGHT ),
-  mRemoveAction( Dali::Constraint::DEFAULT_REMOVE_ACTION ),
+#ifdef DEBUG_ENABLED
+  unsigned int ConstraintBase::mCurrentInstanceCount = 0;
+  unsigned int ConstraintBase::mTotalInstanceCount   = 0;
+#endif
+
+ConstraintBase::ConstraintBase( PropertyOwnerContainer& ownerSet, RemoveAction removeAction )
+: mRemoveAction( removeAction ),
   mFirstApply( true ),
   mDisconnected( true ),
   mObservedOwners( ownerSet )
 {
+#ifdef DEBUG_ENABLED
+  ++mCurrentInstanceCount;
+  ++mTotalInstanceCount;
+#endif
 }
 
 ConstraintBase::~ConstraintBase()
@@ -45,19 +51,34 @@ ConstraintBase::~ConstraintBase()
     StopObservation();
   }
 
-// TODO - Override new & delete to provide this for everything
 #ifdef DEBUG_ENABLED
-  // Fill with garbage pattern to help detect invalid memory access
-  memset ( &mWeight, 0xFA, sizeof(mWeight) );
+  --mCurrentInstanceCount;
 #endif
 }
 
 void ConstraintBase::ResetDefaultProperties( BufferIndex updateBufferIndex )
 {
-  // Not used, since the weight property is reset by PropertyOwner
   DALI_ASSERT_DEBUG( false );
 }
 
+unsigned int ConstraintBase::GetCurrentInstanceCount()
+{
+#ifdef DEBUG_ENABLED
+  return mCurrentInstanceCount;
+#else
+  return 0u;
+#endif
+}
+
+unsigned int ConstraintBase::GetTotalInstanceCount()
+{
+#ifdef DEBUG_ENABLED
+  return mTotalInstanceCount;
+#else
+  return 0u;
+#endif
+}
+
 } // namespace SceneGraph
 
 } // namespace Internal