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
Merge "Sync UTC harness" into devel/master
[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
8075dbe
..
42050e4
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
@@
-71,7
+71,9
@@
public:
Integration::StencilBufferAvailable GetStencilBufferRequired() override { return Integration::StencilBufferAvailable::FALSE; };
Integration::StencilBufferAvailable GetStencilBufferRequired() override { return Integration::StencilBufferAvailable::FALSE; };
- int GetOrientation() const override {return 0;};
+ int GetSurfaceOrientation() const override {return 0;};
+
+ int GetScreenOrientation() const override {return 0;};
void SetBackgroundColor( Vector4 color ) {};
void SetBackgroundColor( Vector4 color ) {};
@@
-125,6
+127,8
@@
public:
Dali::RenderSurfaceInterface& GetRenderSurface();
Dali::RenderSurfaceInterface& GetRenderSurface();
+ Dali::RenderTaskList GetRenderTaskList();
+
protected:
TestRenderSurface mRenderSurface;
protected:
TestRenderSurface mRenderSurface;