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=3c01e99e38739f3da5a6a32468f55992c9711049;hp=d7878e31e629c4371572762d9a5333710bf56274;hb=4593cc619ab0739fc8586c0c752209c555b0c8e3;hpb=7dbe383e1d72909ceb2ef46e33b880243911df7e

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 d7878e3..3c01e99 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
@@ -21,7 +21,6 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/layer.h>
-#include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/base-object.h>
 
 #define DALI_WINDOW_H
@@ -164,6 +163,16 @@ FocusChangeSignalType& Window::FocusChangeSignal()
   return GetImplementation( *this ).mFocusChangeSignal;
 }
 
+Window::KeyEventSignalType& Window::KeyEventSignal()
+{
+  return GetImplementation( *this ).KeyEventSignal();
+}
+
+Window::TouchSignalType& Window::TouchSignal()
+{
+  return GetImplementation( *this ).TouchSignal();
+}
+
 namespace DevelWindow
 {
 
@@ -189,24 +198,24 @@ Window DownCast( BaseHandle handle )
   return Dali::Window( windowImpl );
 }
 
-EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window )
+void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId )
 {
-  return GetImplementation( window ).GetScene().EventProcessingFinishedSignal();
+  CallbackBase::Execute( *callback, frameId );
 }
 
-KeyEventSignalType& KeyEventSignal( Window window )
+void AddFramePresentedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId )
 {
-  return GetImplementation( window ).KeyEventSignal();
+  CallbackBase::Execute( *callback, frameId );
 }
 
-KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window )
+EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window )
 {
-  return GetImplementation( window ).KeyEventGeneratedSignal();
+  return GetImplementation( window ).GetScene().EventProcessingFinishedSignal();
 }
 
-TouchSignalType& TouchSignal( Window window )
+KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window )
 {
-  return GetImplementation( window ).TouchSignal();
+  return GetImplementation( window ).KeyEventGeneratedSignal();
 }
 
 WheelEventSignalType& WheelEventSignal( Window window )