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-window.cpp;h=2726434b894396c6c208956179bc3669a40a8553;hp=1b8cdbd679fb0b1d9f8e59fcc2ae48f9c45b6277;hb=d559bcfd3dacea3441cf649b28687a0ea8bb1912;hpb=a08597a200d87bbc9e43fce6a94a3269c972346e

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
index 1b8cdbd..2726434 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
@@ -45,25 +45,20 @@ class Window : public Dali::BaseObject
 public:
 
   Window( const PositionSize& positionSize )
-  : mScene( Dali::Integration::Scene::New( Size( positionSize.width, positionSize.height ) ) ),
-    mRenderSurface( new TestRenderSurface( positionSize ) )
+  : mRenderSurface( positionSize ),
+    mScene( Dali::Integration::Scene::New( mRenderSurface ) )
   {
-    mScene.SetSurface( *mRenderSurface );
   }
 
-  virtual ~Window()
-  {
-    delete mRenderSurface;
-    mRenderSurface = nullptr;
-  }
+  virtual ~Window() = default;
 
   static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent)
   {
     return new Window( positionSize );
   }
 
+  TestRenderSurface mRenderSurface;
   Integration::Scene mScene;
-  TestRenderSurface* mRenderSurface;
 };
 
 } // Adaptor
@@ -124,7 +119,7 @@ Integration::Scene Window::GetScene()
 
 Integration::RenderSurface& Window::GetRenderSurface()
 {
-  return *GetImplementation( *this ).mRenderSurface;
+  return GetImplementation( *this ).mRenderSurface;
 }
 
 namespace DevelWindow