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-scene-holder-impl.h;h=86b3bd9a699ca632ab62b11e12f42aa8e98ee5ba;hp=b466cfc9746e8d5b35d936978edf57a13fb4244f;hb=6154e1e69b7cd3afb49213c4f6f5730dd3df074e;hpb=a00bbe499550a054e6692eb46b32f8c1548f3647

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
index b466cfc..86b3bd9 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
@@ -33,43 +33,45 @@ public:
 
   TestRenderSurface( PositionSize positionSize ) {};
 
-  virtual PositionSize GetPositionSize() const { PositionSize size; return size; };
+  PositionSize GetPositionSize() const override { PositionSize size; return size; };
 
   virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; }
 
-  virtual void InitializeGraphics() {};
+  void InitializeGraphics() override {};
 
-  virtual void CreateSurface() {};
+  void CreateSurface() override {};
 
-  virtual void DestroySurface() {};
+  void DestroySurface() override {};
 
-  virtual bool ReplaceGraphicsSurface() { return false; };
+  bool ReplaceGraphicsSurface() override { return false; };
 
-  virtual void MoveResize( Dali::PositionSize positionSize ) {};
+  void MoveResize( Dali::PositionSize positionSize ) override {};
 
-  virtual void StartRender() {};
+  void StartRender() override {};
 
-  virtual bool PreRender( bool resizingSurface ) { return false; };
+  bool PreRender( bool resizingSurface, const std::vector<Rect<int>>& damagedRects, Rect<int>& clippingRect  ) override { return false; };
 
-  virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface ) {};
+  void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector<Rect<int>>& damagedRects ) override {};
 
-  virtual void StopRender() {};
+  void StopRender() override {};
 
-  virtual void ReleaseLock() {};
+  void ReleaseLock() override {};
 
-  virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) {};
+  void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override {};
 
-  virtual RenderSurfaceInterface::Type GetSurfaceType() { return RenderSurfaceInterface::WINDOW_RENDER_SURFACE; };
+  RenderSurfaceInterface::Type GetSurfaceType() override { return RenderSurfaceInterface::WINDOW_RENDER_SURFACE; };
 
-  virtual void MakeContextCurrent() {};
+  void MakeContextCurrent() override {};
 
-  virtual Integration::DepthBufferAvailable GetDepthBufferRequired() { return Integration::DepthBufferAvailable::FALSE; };
+  Integration::DepthBufferAvailable GetDepthBufferRequired() override { return Integration::DepthBufferAvailable::FALSE; };
 
-  virtual Integration::StencilBufferAvailable GetStencilBufferRequired() { return Integration::StencilBufferAvailable::FALSE; };
+  Integration::StencilBufferAvailable GetStencilBufferRequired() override { return Integration::StencilBufferAvailable::FALSE; };
 
-  virtual void SetBackgroundColor( Vector4 color ) {};
+  int GetOrientation() const override {return 0;};
 
-  virtual Vector4 GetBackgroundColor() { return Color::WHITE; };
+  void SetBackgroundColor( Vector4 color ) {};
+
+  Vector4 GetBackgroundColor() { return Color::WHITE; };
 };
 
 namespace Internal
@@ -106,7 +108,7 @@ public:
 
   Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
 
-  Dali::Integration::SceneHolder::TouchSignalType& TouchSignal();
+  Dali::Integration::SceneHolder::TouchEventSignalType& TouchedSignal();
 
   Dali::Integration::SceneHolder::WheelEventSignalType& WheelEventSignal();