projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a553b6
)
Revert "[Tizen] Add log if destroyed visual get some signal"
author
Jiyun Yang
<ji.yang@samsung.com>
Mon, 25 Sep 2023 05:27:52 +0000
(14:27 +0900)
committer
Jiyun Yang
<ji.yang@samsung.com>
Mon, 25 Sep 2023 05:27:52 +0000
(14:27 +0900)
This reverts commit
0a553b64399609599b361531bad3d4e2f449a7d2
.
dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
patch
|
blob
|
history
dali-toolkit/internal/visuals/image/image-visual.cpp
patch
|
blob
|
history
dali-toolkit/internal/visuals/svg/svg-visual.cpp
patch
|
blob
|
history
dali-toolkit/internal/visuals/visual-base-impl.cpp
patch
|
blob
|
history
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
(file)
--- 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()
{
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)
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()
{
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);
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
a8746c2
..
2f0e800
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/
dali-toolkit/internal/visuals/image/image-visual.cpp
@@
-1070,11
+1070,6
@@
void ImageVisual::FastLoadComplete(FastTrackLoadingTaskPtr task)
void ImageVisual::LoadComplete(bool loadingSuccess, TextureInformation textureInformation)
{
Toolkit::Visual::ResourceStatus resourceStatus;
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)
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
(file)
--- 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)
{
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();
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
(file)
--- 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;
Visual::Base::~Base()
{
delete mImpl;
- mImpl = nullptr;
}
void Visual::Base::Initialize()
}
void Visual::Base::Initialize()