(PixmapImage) Removed dependency on Adaptor

[platform/core/uifw/dali-adaptor.git] / adaptors / x11 / pixmap-image-impl.h

diff --git a/adaptors/x11/pixmap-image-impl.h b/adaptors/x11/pixmap-image-impl.h
index 464081c..bd47110 100644 (file)
--- a/adaptors/x11/pixmap-image-impl.h
+++ b/adaptors/x11/pixmap-image-impl.h
@@ -20,9 +20,9 @@
 
 // EXTERNAL INCLUDES
 #include <Ecore_X.h>
-#include <pixmap-image.h>
 
 // INTERNAL INCLUDES
+#include <pixmap-image.h>
 
 namespace Dali
 {
@@ -32,7 +32,6 @@ namespace Internal
 
 namespace Adaptor
 {
-class Adaptor;
 class EglImageExtensions;
 
 /**
@@ -48,26 +47,14 @@ public:
    * @param[in] width The width of the image.
    * @param[in] height The height of the image.
    * @param[in] depth color depth of the pixmap
-   * @param[in] adaptor reference to dali adaptor
    * @param[in] pixmap contains either: pixmap of type X11 Pixmap , a Ecore_X_Pixmap or is empty
    * @return A smart-pointer to a newly allocated image.
    */
   static PixmapImage* New(unsigned int width,
                           unsigned int height,
                           Dali::PixmapImage::ColorDepth depth,
-                          Dali::Adaptor& adaptor,
                           Any pixmap);
 
-   /**
-    * @copydoc Dali::PixmapImage::GetPixmap()
-    */
-  Any GetPixmap(Dali::PixmapImage::PixmapAPI api) const;
-
-  /**
-   * @copydoc Dali::PixmapImage::GetDisplay()
-   */
-  Any GetDisplay() const;
-
   /**
    * @copydoc Dali::PixmapImage::GetPixels()
    */
@@ -129,13 +116,11 @@ private:
    * @param[in] width The width of the image.
    * @param[in] height The height of the image.
    * @param[in] colour depth of the pixmap
-   * @param[in] adaptor a reference to Dali adaptor
    * @param[in] pixmap contains either: pixmap of type X11 Pixmap , a Ecore_X_Pixmap or is empty
    */
   PixmapImage(unsigned int width,
               unsigned  int height,
               Dali::PixmapImage::ColorDepth depth,
-              Dali::Adaptor &adaptor,
               Any pixmap);
 
   /**
@@ -169,23 +154,16 @@ private:
    */
   void GetPixmapDetails();
 
-  /**
-   * Returns the egl image extensions class from the adaptor
-   * @return reference to egl image extensionsa
-   */
-  EglImageExtensions* GetEglImageExtensions() const;
-
 private:
 
   unsigned int mWidth;                        ///< pixmap width
   unsigned int mHeight;                       ///< pixmap heights
   bool mOwnPixmap;                            ///< Whether we created pixmap or not
   Ecore_X_Pixmap mPixmap;                     ///< From Xlib
-  Ecore_X_Display* mDisplay;                  ///< x-connection used to create pixmap (if it was not created outside of PixmapImage)
   Pixel::Format mPixelFormat;                 ///< pixmap pixel format
   Dali::PixmapImage::ColorDepth mColorDepth;  ///< color depth of pixmap
-  Adaptor& mAdaptor;                          ///< adaptor
   void* mEglImageKHR;                         ///< From EGL extension
+  EglImageExtensions* mEglImageExtensions;    ///< The EGL Image Extensions
 };
 
 } // namespace Adaptor