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.h;h=5deb7a6e9b3d6dfab3fe988f5e8ffc8813a690dc;hp=2ff4370a1eac002d1924c96ea19add582fb4456c;hb=ef15505c94dffeb0639c91d9d3cd374918c21c4f;hpb=6d4347e7eff8ab62127a60984af2f1cdf156716c

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
index 2ff4370..5deb7a6 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
@@ -32,7 +32,7 @@ class Actor;
 class Layer;
 class RenderSurfaceInterface;
 struct KeyEvent;
-class TouchData;
+class TouchEvent;
 struct WheelEvent;
 
 typedef Dali::Rect<int> PositionSize;
@@ -52,7 +52,7 @@ class Window : public BaseHandle
 {
 public:
   using KeyEventSignalType = Signal< void (const KeyEvent&) >;
-  using TouchSignalType = Signal< void (const TouchData&) >;
+  using TouchSignalType = Signal< void (const TouchEvent&) >;
 
   static Window New(PositionSize windowPosition, const std::string& name, bool isTransparent = false);
   static Window New(PositionSize windowPosition, const std::string& name, const std::string& className, bool isTransparent = false);
@@ -61,6 +61,8 @@ public:
   ~Window();
   Window(const Window& handle);
   Window& operator=(const Window& rhs);
+  Window( Window&& rhs );
+  Window& operator=( Window&& rhs );
 
   Integration::Scene GetScene();
   Dali::RenderSurfaceInterface& GetRenderSurface();
@@ -91,6 +93,8 @@ typedef Signal< void ( Window, bool ) > VisibilityChangedSignalType;
 
 Dali::Window Get( Actor actor );
 Dali::Window DownCast(  BaseHandle handle );
+void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId );
+void AddFramePresentedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId );
 
 EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window );
 KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Window window );