Merge "Modified ImfManager to include virtual keyboard APIs" into devel/master

[platform/core/uifw/dali-adaptor.git] / adaptors / common / indicator-buffer.h

diff --git a/adaptors/common/indicator-buffer.h b/adaptors/common/indicator-buffer.h
index 0bb1203..f32bd32 100644 (file)
--- a/adaptors/common/indicator-buffer.h
+++ b/adaptors/common/indicator-buffer.h
@@ -40,7 +40,7 @@ typedef IntrusivePtr<IndicatorBuffer> IndicatorBufferPtr;
 
 /**
  * The IndicatorBuffer class uses the best available implementation for rendering indicator data.
- * On platforms where EglImage is available it uses either SharedGlBuffer or PixmapImage, on older
+ * On platforms where EglImage is available it uses either SharedGlBuffer or NativeImageSource, on older
  * platforms it falls back to using a bitmap buffer based solution.
  */
 class IndicatorBuffer : public RefObject
@@ -64,7 +64,7 @@ public:
    * Returns the NativeImage used internally
    * @return the NativeImage used internally
    */
-  NativeImage& GetNativeImage() const;
+  NativeImageInterface& GetNativeImage() const;
 
   /**
    * Set currently used Adaptor
@@ -73,7 +73,7 @@ public:
   void SetAdaptor( Adaptor* adaptor );
 
 private:
-  NativeImagePtr mNativeImage; ///< Image buffer created for shared file copy
+  NativeImageInterfacePtr mNativeImage; ///< Image buffer created for shared file copy
 
   NativeBitmapBufferPtr mBitmapBuffer;    ///< Image buffer created for shared file copy if extension not available
 
@@ -82,10 +82,6 @@ private:
   int           mImageWidth;
   int           mImageHeight;
   Pixel::Format mPixelFormat;
-
-  // Only used with fallback bitmap buffer implementation
-  bool  mUpdatingBitmap:1;      ///< Whether BitmapImage is being uploaded to graphics memory
-  bool  mUpdateBitmapAgain:1;   ///< Whether to update BitmapImage again after upload complete
 };
 
 } // Adaptor