projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Syncing test harness
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-scene-holder-impl.h
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
20c37cb
..
0cfdcc0
100644
(file)
--- 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
/*
#define DALI_TOOLKIT_SCENE_HOLDER_IMPL_H
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
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.
*
* 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 ) {};
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 GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; }
- v
irtual void InitializeGraphics()
{};
+ v
oid InitializeGraphics() override
{};
- v
irtual void CreateSurface()
{};
+ v
oid CreateSurface() override
{};
- v
irtual void DestroySurface()
{};
+ v
oid DestroySurface() override
{};
-
virtual bool ReplaceGraphicsSurface()
{ return false; };
+
bool ReplaceGraphicsSurface() override
{ return false; };
- v
irtual void MoveResize( Dali::PositionSize positionSize )
{};
+ v
oid MoveResize( Dali::PositionSize positionSize ) override
{};
- v
irtual void StartRender()
{};
+ v
oid StartRender() override
{};
-
virtual bool PreRender( bool resizingSurface, const std::vector<Rect<int>>& damagedRects, Rect<int>& clippingRect )
{ 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, const std::vector<Rect<int>>& damagedRects ) {};
+ void PostRender()
+ {
+ }
-
virtual void StopRender()
{};
+
//void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector<Rect<int>>& damagedRects ) override
{};
- v
irtual void ReleaseLock()
{};
+ v
oid StopRender() override
{};
- v
irtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization )
{};
+ v
oid ReleaseLock() override
{};
- v
irtual RenderSurfaceInterface::Type GetSurfaceType() { return RenderSurfaceInterface::WINDOW_RENDER_SURFACE;
};
+ v
oid SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override {
};
-
virtual void MakeContextCurrent() {
};
+
RenderSurfaceInterface::Type GetSurfaceType() override { return RenderSurfaceInterface::WINDOW_RENDER_SURFACE;
};
- v
irtual Integration::DepthBufferAvailable GetDepthBufferRequired() { return Integration::DepthBufferAvailable::FALSE;
};
+ v
oid MakeContextCurrent() override {
};
-
virtual Integration::StencilBufferAvailable GetStencilBufferRequired() { return Integration::Stencil
BufferAvailable::FALSE; };
+
Integration::DepthBufferAvailable GetDepthBufferRequired() override { return Integration::Depth
BufferAvailable::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
};
namespace Internal