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
Loop count support for animated GIF
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-cache.h
diff --git
a/dali-toolkit/internal/visuals/visual-factory-cache.h
b/dali-toolkit/internal/visuals/visual-factory-cache.h
index
7f13da6
..
bb4744c
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.h
@@
-47,7
+47,7
@@
typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
/**
* Caches shaders and geometries. Owned by VisualFactory.
*/
/**
* Caches shaders and geometries. Owned by VisualFactory.
*/
-class VisualFactoryCache
: public RefObject
+class VisualFactoryCache
{
public:
{
public:
@@
-67,6
+67,7
@@
public:
IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
+ NINE_PATCH_MASK_SHADER,
SVG_SHADER,
TEXT_SHADER_MULTI_COLOR_TEXT,
TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
SVG_SHADER,
TEXT_SHADER_MULTI_COLOR_TEXT,
TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
@@
-107,8
+108,15
@@
public:
/**
* @brief Constructor
/**
* @brief Constructor
+ *
+ * @param[in] preMultiplyOnLoad True if image visuals should pre-multiply alpha on image load.
*/
*/
- VisualFactoryCache();
+ VisualFactoryCache( bool preMultiplyOnLoad );
+
+ /**
+ * @brief Destructor
+ */
+ ~VisualFactoryCache();
/**
* Request geometry of the given type.
/**
* Request geometry of the given type.
@@
-155,6
+163,16
@@
public:
*/
static Image GetBrokenVisualImage();
*/
static Image GetBrokenVisualImage();
+ /**
+ * @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
+ */
+ void SetPreMultiplyOnLoad( bool preMultiply );
+
+ /**
+ * @copydoc Toolkit::VisualFactory::GetPreMultiplyOnLoad()
+ */
+ bool GetPreMultiplyOnLoad();
+
public:
/**
* Get the image atlas manager.
public:
/**
* Get the image atlas manager.
@@
-190,11
+208,6
@@
private: // for svg rasterization thread
protected:
/**
protected:
/**
- * A reference counted object may only be deleted by calling Unreference()
- */
- virtual ~VisualFactoryCache();
-
- /**
* Undefined copy constructor.
*/
VisualFactoryCache(const VisualFactoryCache&);
* Undefined copy constructor.
*/
VisualFactoryCache(const VisualFactoryCache&);
@@
-212,6
+225,7
@@
private:
TextureManager mTextureManager;
NPatchLoader mNPatchLoader;
SvgRasterizeThread* mSvgRasterizeThread;
TextureManager mTextureManager;
NPatchLoader mNPatchLoader;
SvgRasterizeThread* mSvgRasterizeThread;
+ bool mPreMultiplyOnLoad;
};
} // namespace Internal
};
} // namespace Internal