X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-cache.h;h=75c949ecfc4a29dbd3646311af821d6765e7a411;hb=2cdc15bcda53ce7feff32cd2358cc1f4d943cbfa;hp=470cf07dcc44f63d7fb5c6ee7ff83714682dc111;hpb=39d4d89a9cc3bcd134922827d7009b2188fe7ffe;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.h b/dali-toolkit/internal/visuals/visual-factory-cache.h
index 470cf07..75c949e 100644
--- a/dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_VISUAL_FACTORY_CACHE_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -23,11 +23,11 @@
 #include <dali/public-api/rendering/geometry.h>
 #include <dali/public-api/rendering/shader.h>
 #include <dali/devel-api/common/owner-container.h>
-#include <dali/devel-api/object/weak-handle.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/npatch-loader.h>
 #include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
+#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
 
 namespace Dali
 {
@@ -37,11 +37,12 @@ namespace Toolkit
 
 namespace Internal
 {
-
 class ImageAtlasManager;
+class NPatchLoader;
+class TextureManager;
+
 typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
 
-class NPatchLoader;
 
 /**
  * Caches shaders and geometries. Owned by VisualFactory.
@@ -67,7 +68,12 @@ public:
     IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
     NINE_PATCH_SHADER,
     SVG_SHADER,
-    TEXT_SHADER,
+    TEXT_SHADER_MULTI_COLOR_TEXT,
+    TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
+    TEXT_SHADER_SINGLE_COLOR_TEXT,
+    TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE,
+    TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_EMOJI,
+    TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_EMOJI,
     WIREFRAME_SHADER,
     SHADER_TYPE_MAX = WIREFRAME_SHADER
   };
@@ -145,6 +151,12 @@ public:
   ImageAtlasManagerPtr GetAtlasManager();
 
   /**
+   * Get the texture manager
+   * @return A reference to the texture manager
+   */
+  TextureManager& GetTextureManager();
+
+  /**
    * Get the N-Patch texture cache.
    * @return A reference to the N patch loader
    */
@@ -185,8 +197,8 @@ private:
   Shader mShader[SHADER_TYPE_MAX+1];
 
   ImageAtlasManagerPtr mAtlasManager;
-  NPatchLoader mNPatchLoader;
-
+  TextureManager       mTextureManager;
+  NPatchLoader         mNPatchLoader;
   SvgRasterizeThread*  mSvgRasterizeThread;
 };