X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-scene-holder.cpp;h=132ce7951988b3a115056183cca4aa041646337f;hb=a1d6238d1bb9d8ca13d9bca6a4d58b633b0eb906;hp=111f36225b3bff1fee26ae2ff2444ad85862067c;hpb=078278a2ea58db1f07114513bf21783eb689f63a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp index 111f362..132ce79 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp @@ -26,6 +26,7 @@ #include #include +#include using AdaptorImpl = Dali::Internal::Adaptor::Adaptor; @@ -105,9 +106,9 @@ Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEve return mScene.KeyEventGeneratedSignal(); } -Dali::Integration::SceneHolder::TouchSignalType& SceneHolder::TouchSignal() +Dali::Integration::SceneHolder::TouchEventSignalType& SceneHolder::TouchedSignal() { - return mScene.TouchSignal(); + return mScene.TouchedSignal(); } Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal() @@ -115,6 +116,11 @@ Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSig return mScene.WheelEventSignal(); } +Dali::Integration::SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal() +{ + return mScene.WheelEventGeneratedSignal(); +} + Integration::Scene SceneHolder::GetScene() { return mScene; @@ -125,6 +131,11 @@ Dali::RenderSurfaceInterface& SceneHolder::GetRenderSurface() return mRenderSurface; } +Dali::RenderTaskList SceneHolder::GetRenderTaskList() +{ + return mScene.GetRenderTaskList(); +} + } // namespace Adaptor } // namespace Internal @@ -225,9 +236,9 @@ SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal() return GetImplementation( *this ).KeyEventGeneratedSignal(); } -SceneHolder::TouchSignalType& SceneHolder::TouchSignal() +SceneHolder::TouchEventSignalType& SceneHolder::TouchedSignal() { - return GetImplementation( *this ).TouchSignal(); + return GetImplementation( *this ).TouchedSignal(); } SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal() @@ -235,6 +246,11 @@ SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal() return GetImplementation( *this ).WheelEventSignal(); } +SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal() +{ + return GetImplementation( *this ).WheelEventGeneratedSignal(); +} + } // Integration } // Dali