X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-adaptor-impl.h;h=e49b3587725bb8939e110673c0f404a9d4973cc5;hp=2e5a2cb1c5de083ac23dac5e4a7b54f7ab5e78d1;hb=8ae521ab64a3922f3419fbbfb83dde57e6135cf5;hpb=51bd29a1b76ba44dd3b0cc34db1193ab83fa7661

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 2e5a2cb..e49b358 100644
--- 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
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_ADAPTOR_IMPL_H__
-#define __DALI_TOOLKIT_ADAPTOR_IMPL_H__
+#ifndef DALI_TOOLKIT_ADAPTOR_IMPL_H
+#define DALI_TOOLKIT_ADAPTOR_IMPL_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,52 +18,35 @@
  *
  */
 
-#include <dali/devel-api/adaptor-framework/render-surface.h>
+#include <dali/integration-api/adaptors/render-surface-interface.h>
 
 namespace Dali
 {
 class EglInterface;
 class DisplayConnection;
 class ThreadSynchronizationInterface;
+class Window;
 
-namespace Integration
-{
-
-class GlAbstraction;
-
-} // namespace Integration
+using WindowContainer = std::vector<Window>;
 
-class TestRenderSurface : public RenderSurface
+namespace Internal
 {
-public:
-  virtual PositionSize GetPositionSize() const { PositionSize size; return size; }
-
-  virtual void InitializeEgl( EglInterface& egl ) {}
-
-  virtual void CreateEglSurface( EglInterface& egl ) {}
-
-  virtual void DestroyEglSurface( EglInterface& egl ) {}
-
-  virtual bool ReplaceEGLSurface( EglInterface& egl ) { return false; }
 
-  virtual void MoveResize( Dali::PositionSize positionSize ) {}
-
-  virtual void SetViewMode( ViewMode viewMode ) {}
-
-  virtual void StartRender() {}
+namespace Adaptor
+{
 
-  virtual bool PreRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, bool resizingSurface ) { return false; }
+class GraphicsInterface;
 
-  virtual void PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, bool replacingSurface, bool resizingSurface ) {}
+} // namespace Adaptor
 
-  virtual void StopRender() {}
+} // namespace Internal
 
-  virtual void ReleaseLock() {}
+namespace Integration
+{
 
-  virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) {}
+class GlAbstraction;
 
-  virtual RenderSurface::Type GetSurfaceType() { return RenderSurface::ECORE_RENDER_SURFACE; }
-};
+} // namespace Integration
 
 namespace Internal
 {
@@ -78,14 +61,18 @@ public:
   ~Adaptor();
 
 public:
-  static Dali::RenderSurface& GetSurface();
+  static Dali::RenderSurfaceInterface& GetSurface();
+  static Dali::WindowContainer GetWindows();
   static Dali::Adaptor::AdaptorSignalType& AdaptorSignal();
+  static Dali::Adaptor::WindowCreatedSignalType& WindowCreatedSignal();
   static bool mAvailable;
   static Vector<CallbackBase*> mCallbacks;
+  static Dali::WindowContainer mWindows;
+  static Dali::Adaptor::WindowCreatedSignalType* mWindowCreatedSignal;
 };
 
 } // namespace Adaptor
 } // namespace Internal
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_ADAPTOR_IMPL_H__
+#endif // DALI_TOOLKIT_ADAPTOR_IMPL_H