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=0cfdcc09a0501e5db38ac1e500b00485f2f40743;hp=b466cfc9746e8d5b35d936978edf57a13fb4244f;hb=32d9c82fd183da60e3c54584d888388e73b92d34;hpb=a58c91ed5ae177ab8ed831cc00779c0b1307ee0b 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..0cfdcc0 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 @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_SCENE_HOLDER_IMPL_H /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,43 +33,49 @@ 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>& damagedRects, Rect& clippingRect ) override { return false; }; - virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface ) {}; + void PostRender() + { + } - virtual void StopRender() {}; + //void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) override {}; - virtual void ReleaseLock() {}; + void StopRender() override {}; - virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) {}; + void ReleaseLock() override {}; - virtual RenderSurfaceInterface::Type GetSurfaceType() { return RenderSurfaceInterface::WINDOW_RENDER_SURFACE; }; + void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override {}; - virtual void MakeContextCurrent() {}; + RenderSurfaceInterface::Type GetSurfaceType() override { return RenderSurfaceInterface::WINDOW_RENDER_SURFACE; }; - virtual Integration::DepthBufferAvailable GetDepthBufferRequired() { return Integration::DepthBufferAvailable::FALSE; }; + void MakeContextCurrent() override {}; - virtual Integration::StencilBufferAvailable GetStencilBufferRequired() { return Integration::StencilBufferAvailable::FALSE; }; + Integration::DepthBufferAvailable GetDepthBufferRequired() override { return Integration::DepthBufferAvailable::FALSE; }; - virtual void SetBackgroundColor( Vector4 color ) {}; + Integration::StencilBufferAvailable GetStencilBufferRequired() override { return Integration::StencilBufferAvailable::FALSE; }; - virtual Vector4 GetBackgroundColor() { return Color::WHITE; }; + int GetOrientation() const override {return 0;}; + + void SetBackgroundColor( Vector4 color ) {}; + + Vector4 GetBackgroundColor() { return Color::WHITE; }; }; namespace Internal @@ -106,7 +112,7 @@ public: Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& KeyEventGeneratedSignal(); - Dali::Integration::SceneHolder::TouchSignalType& TouchSignal(); + Dali::Integration::SceneHolder::TouchEventSignalType& TouchedSignal(); Dali::Integration::SceneHolder::WheelEventSignalType& WheelEventSignal();