projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.3.28] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-image
/
image-cache.h
diff --git
a/dali-toolkit/internal/visuals/animated-image/image-cache.h
b/dali-toolkit/internal/visuals/animated-image/image-cache.h
index
b15101e
..
aee80b2
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-image/image-cache.h
+++ b/
dali-toolkit/internal/visuals/animated-image/image-cache.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_IMAGE_CACHE_H
/*
#define DALI_TOOLKIT_INTERNAL_IMAGE_CACHE_H
/*
- * Copyright (c) 202
2
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
4
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-27,7
+27,7
@@
namespace Toolkit
{
namespace Internal
{
{
namespace Internal
{
-class ImageCache
: public TextureManager::LifecycleObserver
+class ImageCache
{
public:
/**
{
public:
/**
@@
-137,11
+137,6
@@
public:
virtual void SetInterval(uint32_t interval);
private:
virtual void SetInterval(uint32_t interval);
private:
- /**
- * @brief Called before the texture manager is destroyed.
- */
- void TextureManagerDestroyed() final;
-
void AllocateMaskData();
protected:
void AllocateMaskData();
protected:
@@
-156,7
+151,6
@@
protected:
TextureManager::LoadState mLoadState;
bool mRequestingLoad : 1;
bool mPreMultiplyOnLoad : 1;
TextureManager::LoadState mLoadState;
bool mRequestingLoad : 1;
bool mPreMultiplyOnLoad : 1;
- bool mTextureManagerAlive : 1;
};
} // namespace Internal
};
} // namespace Internal