From d4dffcf5267f3fc36c284f70347c4161a94c1ec9 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 16 Sep 2019 15:25:07 +0900 Subject: [PATCH] Revert "[Tizen] Fix TC code conflict" This reverts commit 4440dd2f922b7572d51bf6ae870836b267c26993. --- automated-tests/src/dali/utc-Dali-Scene.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/automated-tests/src/dali/utc-Dali-Scene.cpp b/automated-tests/src/dali/utc-Dali-Scene.cpp index 11d55a6..e393366 100644 --- a/automated-tests/src/dali/utc-Dali-Scene.cpp +++ b/automated-tests/src/dali/utc-Dali-Scene.cpp @@ -1130,8 +1130,11 @@ 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(); -- 2.7.4