Revert "Separating integration-devel from devel package for 2nd party to use adaptor"

[platform/core/uifw/dali-adaptor.git] / adaptors / wayland / pixmap-render-surface.h

diff --git a/adaptors/integration-api/wayland/pixmap-render-surface.h b/adaptors/wayland/pixmap-render-surface.h
similarity index 66%
rename from adaptors/integration-api/wayland/pixmap-render-surface.h
rename to adaptors/wayland/pixmap-render-surface.h
index ede6450..87a81bf 100644 (file)
--- a/adaptors/integration-api/wayland/pixmap-render-surface.h
+++ b/adaptors/wayland/pixmap-render-surface.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H__
-#define __DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H__
+#ifndef __DALI_INTERNAL_ECORE_X_PIXMAP_RENDER_SURFACE_H__
+#define __DALI_INTERNAL_ECORE_X_PIXMAP_RENDER_SURFACE_H__
 
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
@@ -24,13 +24,20 @@
 namespace Dali
 {
 
+namespace Internal
+{
+
+namespace Adaptor
+{
+class TriggerEvent;
+
 namespace ECore
 {
 
 /**
  * Ecore X11 implementation of render surface.
  */
-class PixmapRenderSurface : public EcoreWlRenderSurface
+class PixmapRenderSurface : public RenderSurface
 {
 public:
 
@@ -38,72 +45,74 @@ public:
     * Uses an Wayland surface to render to.
     * @param [in] positionSize the position and size of the surface
     * @param [in] surface can be a Wayland-window (type must be unsigned int).
+    * @param [in] display connection to Wayland-server if the surface is a X window or pixmap (type must be void * to X display struct)
     * @param [in] name optional name of surface passed in
     * @param [in] isTransparent if it is true, surface has 32 bit color depth, otherwise, 24 bit
     */
   PixmapRenderSurface( Dali::PositionSize positionSize,
                        Any surface,
+                       Any display,
                        const std::string& name,
                        bool isTransparent = false);
 
   /**
-   * @copydoc Dali::RenderSurface::~RenderSurface
+   * @copydoc Dali::Internal::Adaptor::ECore::RenderSurface::~RenderSurface
    */
   virtual ~PixmapRenderSurface();
 
 public: // API
 
+public: // from Dali::RenderSurface
+
   /**
-   * @copydoc Dali::ECore::EcoreWlRenderSurface::GetDrawable()
+   * @copydoc Dali::RenderSurface::GetType()
    */
-  virtual Ecore_Wl_Window* GetDrawable();
+  virtual Dali::RenderSurface::SurfaceType GetType();
 
   /**
-   * @brief GetSurface
-   *
-   * @return pixmap
+   * @copydoc Dali::RenderSurface::GetSurface()
    */
   virtual Any GetSurface();
 
-public: // from Dali::RenderSurface
+public: // from Internal::Adaptor::RenderSurface
 
   /**
-   * @copydoc Dali::RenderSurface::InitializeEgl()
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::InitializeEgl()
    */
   virtual void InitializeEgl( EglInterface& egl );
 
   /**
-   * @copydoc Dali::RenderSurface::CreateEglSurface()
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::CreateEglSurface()
    */
   virtual void CreateEglSurface( EglInterface& egl );
 
   /**
-   * @copydoc Dali::RenderSurface::DestroyEglSurface()
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::DestroyEglSurface()
    */
   virtual void DestroyEglSurface( EglInterface& egl );
 
   /**
-   * @copydoc Dali::RenderSurface::ReplaceEGLSurface()
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::ReplaceEGLSurface()
    */
   virtual bool ReplaceEGLSurface( EglInterface& egl );
 
   /**
-   * @copydoc Dali::RenderSurface::StartRender()
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::StartRender()
    */
   virtual void StartRender();
 
   /**
-   * @copydoc Dali::RenderSurface::PreRender()
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::PreRender()
    */
   virtual bool PreRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction );
 
   /**
-   * @copydoc Dali::RenderSurface::PostRender()
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::PostRender()
    */
-  virtual void PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, unsigned int deltaTime, bool replacingSurface );
+  virtual void PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, unsigned int timeDelta, bool replacingSurface );
 
   /**
-   * @copydoc Dali::RenderSurface::StopRender()
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::StopRender()
    */
   virtual void StopRender();
 
@@ -114,10 +123,6 @@ private:
     SYNC_MODE_WAIT
   };
 
-  /**
-   * Set the sync mode.
-   * @param[in] syncMode The sync mode
-   */
   void SetSyncMode( SyncMode syncMode );
 
   /**
@@ -149,6 +154,10 @@ private: // Data
 
 } // namespace ECore
 
+} // namespace Adaptor
+
+} // namespace internal
+
 } // namespace Dali
 
-#endif // __DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H__
+#endif // __DALI_INTERNAL_ECORE_X_PIXMAP_RENDER_SURFACE_H__