From: jmm Date: Mon, 18 Dec 2023 06:42:24 +0000 (+0900) Subject: Revert "[Tizen] Add more guard code to detect memory corruption" X-Git-Tag: accepted/tizen/unified/20231219.160354~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=9d168d231ab21fb46791299cf37dda3872353ba2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[Tizen] Add more guard code to detect memory corruption" This reverts commit 661d9328dd07ed8248a5e0a67e6641c3f3d4e00a. --- diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 4522c78..e270fa5 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -159,7 +159,6 @@ Visual::Base::Base(VisualFactoryCache& factoryCache, FittingMode fittingMode, To : mImpl(new Impl(fittingMode, type)), mFactoryCache(factoryCache) { - mImplOrigin = mImpl; } Visual::Base::~Base() @@ -660,12 +659,6 @@ void Visual::Base::DoSetOffScene(Actor& actor) bool Visual::Base::IsOnScene() const { - if(DALI_UNLIKELY(mImplOrigin != mImpl)) - { - DALI_LOG_ERROR("Fatal error!! Memory corruption occured! this : %p\n", this); - DALI_LOG_ERROR("mImpl : %p, mImplOrigin : %p\n", mImpl, mImplOrigin); - DALI_ASSERT_ALWAYS(false); - } return mImpl->mFlags & Impl::IS_ON_SCENE; } diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h index f03c64c..7ebf239 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_VISUAL_H /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -511,7 +511,6 @@ private: protected: struct Impl; Impl* mImpl; - Impl* mImplOrigin{nullptr}; ///< Check for memory corruption VisualFactoryCache& mFactoryCache; };