Merge "Fixes the change of style when the text-field grabs the keyboard focus." into...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / atlas-manager / atlas-manager-impl.h

diff --git a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
index 5111a6b..5b301f0 100644 (file)
--- a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
+++ b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
@@ -46,7 +46,7 @@ typedef Dali::Vector< Toolkit::AtlasManager::AtlasSlot > slotContainer;
 class AtlasManager;
 typedef IntrusivePtr<AtlasManager> AtlasManagerPtr;
 
-class AtlasManager : public Dali::BaseObject, public ConnectionTracker
+class AtlasManager : public Dali::BaseObject
 {
 public:
 
@@ -64,8 +64,6 @@ public:
     Pixel::Format mPixelFormat;                                         // pixel format used by atlas
     BufferImage mHorizontalStrip;                                       // Image used to pad upload
     BufferImage mVerticalStrip;                                         // Image used to pad upload
-    BufferImage mFilledPixelImage;                                      // Image used by atlas for operations such as underline
-    PixelBuffer* mStripBuffer;                                          // Blank image buffer used to pad upload
     Material mMaterial;                                                 // material used for atlas texture
     Sampler mSampler;                                                   // sampler used for atlas texture
     SizeType mTotalBlocks;                                              // total number of blocks in atlas
@@ -124,14 +122,6 @@ public:
                    bool optimize );
 
   /**
-   * @copydoc Toolkit::AtlasManager::StitchMesh
-   */
-  void StitchMesh(  const Toolkit::AtlasManager::Mesh2D& first,
-                    const Toolkit::AtlasManager::Mesh2D& second,
-                    Toolkit::AtlasManager::Mesh2D& out,
-                    bool optimize );
-
-  /**
    * @copydoc Toolkit::AtlasManager::Remove
    */
   bool Remove( ImageId id );
@@ -195,10 +185,8 @@ private:
 
   std::vector< AtlasDescriptor > mAtlasList;            // List of atlases created
   std::vector< AtlasSlotDescriptor > mImageList;        // List of bitmaps store in atlases
-  Vector< PixelBuffer* > mUploadedImages;               // List of PixelBuffers passed to UploadedSignal
   Toolkit::AtlasManager::AtlasSize mNewAtlasSize;       // Atlas size to use in next creation
   Toolkit::AtlasManager::AddFailPolicy mAddFailPolicy;  // Policy for faling to add an Image
-  SizeType mFilledPixel;                                // 32Bit pixel image for underlining
 
   SizeType CheckAtlas( SizeType atlas,
                        SizeType width,
@@ -223,8 +211,6 @@ private:
 
   void PrintMeshData( const Toolkit::AtlasManager::Mesh2D& mesh );
 
-  void OnUpload( Image image );
-
   Shader mShaderL8;
   Shader mShaderRgba;
 
@@ -255,4 +241,4 @@ inline Internal::AtlasManager& GetImplementation(Toolkit::AtlasManager& manager)
 } // namespace Dali
 
 
- #endif // __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__
\ No newline at end of file
+ #endif // __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__