projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b333e3
)
[Tizen] Fix TC code conflict
92/213092/1
author
Wonsik Jung
<sidein@samsung.com>
Fri, 30 Aug 2019 07:34:29 +0000
(16:34 +0900)
committer
Wonsik Jung
<sidein@samsung.com>
Fri, 30 Aug 2019 07:37:27 +0000
(16:37 +0900)
Change-Id: I73d7cfb6095afa092635c98bf7d93b32c9c605f1
automated-tests/src/dali/utc-Dali-Scene.cpp
patch
|
blob
|
history
diff --git
a/automated-tests/src/dali/utc-Dali-Scene.cpp
b/automated-tests/src/dali/utc-Dali-Scene.cpp
index
e393366
..
11d55a6
100644
(file)
--- a/
automated-tests/src/dali/utc-Dali-Scene.cpp
+++ b/
automated-tests/src/dali/utc-Dali-Scene.cpp
@@
-1130,11
+1130,8
@@
int UtcDaliSceneSurfaceResizedAdditionalScene(void)
Vector2 originalSurfaceSize( 500.0f, 1000.0f );
TestRenderSurface surface( PositionSize( 0.0f, 0.0f, originalSurfaceSize.width, originalSurfaceSize.height ) );
-<<<<<<< HEAD
+
auto scene = Integration::Scene::New( surface );
-=======
- scene.SetSurface( surface, false );
->>>>>>> e6df4fb... Support Client and Screen Rotation
// Ensure stage size does NOT match the surface size
auto stage = Stage::GetCurrent();