From 0c59020225b5de90c07e9d710e1ed48eccd544e4 Mon Sep 17 00:00:00 2001 From: seungho baek Date: Thu, 14 Sep 2023 18:45:18 +0900 Subject: [PATCH] Revert "[Tizen] Add log if destroyed visual get some signal" This reverts commit 378f9648ed57a17512c442bd95105609b8523edf. --- .../animated-vector-image/animated-vector-image-visual.cpp | 12 ------------ dali-toolkit/internal/visuals/image/image-visual.cpp | 5 ----- dali-toolkit/internal/visuals/svg/svg-visual.cpp | 5 ----- dali-toolkit/internal/visuals/visual-base-impl.cpp | 1 - 4 files changed, 23 deletions(-) diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp index c7bffb6..8da0313 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp @@ -625,12 +625,6 @@ void AnimatedVectorImageVisual::OnResourceReady(VectorAnimationTask::ResourceSta void AnimatedVectorImageVisual::OnAnimationFinished() { - if(DALI_UNLIKELY(mImpl == nullptr)) - { - DALI_LOG_ERROR("Fatal error!! already destroyed object callback called! AnimatedVectorImageVisual : %p, url : %s\n", this, mUrl.GetUrl().c_str()); - return; - } - DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnAnimationFinished: action state = %d [%p]\n", mPlayState, this); if(mPlayState != DevelImageVisual::PlayState::STOPPED) @@ -653,12 +647,6 @@ void AnimatedVectorImageVisual::OnAnimationFinished() void AnimatedVectorImageVisual::SendAnimationData() { - if(DALI_UNLIKELY(mImpl == nullptr)) - { - DALI_LOG_ERROR("Fatal error!! already destroyed object callback called! AnimatedVectorImageVisual : %p, url : %s\n", this, mUrl.GetUrl().c_str()); - return; - } - if(mAnimationData.resendFlag) { mVectorAnimationTask->SetAnimationData(mAnimationData); diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 2d14298..49635e4 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -1029,11 +1029,6 @@ void ImageVisual::FastLoadComplete(FastTrackLoadingTaskPtr task) void ImageVisual::LoadComplete(bool loadingSuccess, TextureInformation textureInformation) { Toolkit::Visual::ResourceStatus resourceStatus; - if(DALI_UNLIKELY(mImpl == nullptr)) - { - DALI_LOG_ERROR("Fatal error!! already destroyed object callback called! ImageVisual : %p, url : %s\n", this, mImageUrl.GetUrl().c_str()); - return; - } if(mImpl->mRenderer) { if(textureInformation.useAtlasing) diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index 724c18d..8f9919d 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -336,11 +336,6 @@ void SvgVisual::AddRasterizationTask(const Vector2& size) void SvgVisual::ApplyRasterizedImage(SvgTaskPtr task) { - if(DALI_UNLIKELY(mImpl == nullptr)) - { - DALI_LOG_ERROR("Fatal error!! already destroyed object callback called! SvgVisual : %p, url : %s, task : %p\n", this, mImageUrl.GetUrl().c_str(), task.Get()); - return; - } if(task->HasSucceeded()) { PixelData rasterizedPixelData = task->GetPixelData(); diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index ddaca8c..b4c7fc9 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -127,7 +127,6 @@ Visual::Base::Base(VisualFactoryCache& factoryCache, FittingMode fittingMode, To Visual::Base::~Base() { delete mImpl; - mImpl = nullptr; } void Visual::Base::Initialize() -- 2.7.4