RenderSurface interface change in automated test utils

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-adaptor-impl.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
index 5e71771..ee60af1 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
@@ -18,7 +18,7 @@
  *
  */
 
-#include <dali/devel-api/adaptor-framework/render-surface.h>
+#include <dali/integration-api/adaptors/render-surface.h>
 
 namespace Dali
 {
@@ -26,6 +26,18 @@ class EglInterface;
 class DisplayConnection;
 class ThreadSynchronizationInterface;
 
+namespace Internal
+{
+
+namespace Adaptor
+{
+
+class GraphicsInterface;
+
+} // namespace Adaptor
+
+} // namespace Internal
+
 namespace Integration
 {
 
@@ -38,13 +50,15 @@ class TestRenderSurface : public RenderSurface
 public:
   virtual PositionSize GetPositionSize() const { PositionSize size; return size; }
 
-  virtual void InitializeEgl( EglInterface& egl ) {}
+  virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; }
+
+  virtual void InitializeGraphics( Dali::Internal::Adaptor::GraphicsInterface& graphics, Dali::DisplayConnection& displayConnection ) {};
 
-  virtual void CreateEglSurface( EglInterface& egl ) {}
+  virtual void CreateSurface() {}
 
-  virtual void DestroyEglSurface( EglInterface& egl ) {}
+  virtual void DestroySurface() {}
 
-  virtual bool ReplaceEGLSurface( EglInterface& egl ) { return false; }
+  virtual bool ReplaceGraphicsSurface() { return false; }
 
   virtual void MoveResize( Dali::PositionSize positionSize ) {}
 
@@ -52,9 +66,9 @@ public:
 
   virtual void StartRender() {}
 
-  virtual bool PreRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction ) { return false; }
+  virtual bool PreRender( bool resizingSurface ) { return false; }
 
-  virtual void PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, bool replacingSurface ) {}
+  virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface ) {}
 
   virtual void StopRender() {}
 
@@ -62,7 +76,7 @@ public:
 
   virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) {}
 
-  virtual RenderSurface::Type GetSurfaceType() { return RenderSurface::ECORE_RENDER_SURFACE; }
+  virtual RenderSurface::Type GetSurfaceType() { return RenderSurface::WINDOW_RENDER_SURFACE; }
 };
 
 namespace Internal