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 "Add some APIs into web view." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-BloomView.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
index
3ac0fa3
..
2105c4a
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
@@
-125,9
+125,9
@@
int UtcDaliBloomViewAddRemove(void)
view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
- view.SetProperty( Actor::Property::SIZE,
Stage::GetCurrent
().GetSize());
+ view.SetProperty( Actor::Property::SIZE,
application.GetScene
().GetSize());
view.Add(actor);
view.Add(actor);
-
Stage::GetCurrent
().Add(view);
+
application.GetScene
().Add(view);
DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
@@
-146,21
+146,21
@@
int UtcDaliBloomActivateDeactivate(void)
Toolkit::BloomView view = Toolkit::BloomView::New();
DALI_TEST_CHECK( view );
Toolkit::BloomView view = Toolkit::BloomView::New();
DALI_TEST_CHECK( view );
- RenderTaskList taskList =
Stage::GetCurrent
().GetRenderTaskList();
+ RenderTaskList taskList =
application.GetScene
().GetRenderTaskList();
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
- view.SetProperty( Actor::Property::SIZE,
Stage::GetCurrent
().GetSize());
+ view.SetProperty( Actor::Property::SIZE,
application.GetScene
().GetSize());
view.Add(Actor::New());
view.Add(Actor::New());
-
Stage::GetCurrent
().Add(view);
+
application.GetScene
().Add(view);
view.Activate();
view.Activate();
- RenderTaskList taskList2 =
Stage::GetCurrent
().GetRenderTaskList();
+ RenderTaskList taskList2 =
application.GetScene
().GetRenderTaskList();
DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
view.Deactivate();
DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
view.Deactivate();
- RenderTaskList taskList3 =
Stage::GetCurrent
().GetRenderTaskList();
+ RenderTaskList taskList3 =
application.GetScene
().GetRenderTaskList();
DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() );
END_TEST;
}
DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() );
END_TEST;
}
@@
-209,7
+209,7
@@
int UtcDaliBloomOnSizeSet(void)
BloomView view = Toolkit::BloomView::New();
BloomView view = Toolkit::BloomView::New();
-
Stage::GetCurrent
().Add( view );
+
application.GetScene
().Add( view );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();