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
Add api for get the internal media player handle of the VideoView
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-scene-holder.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
index
7aec884
..
1075778
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
@@
-16,7
+16,7
@@
*/
#include <dali/integration-api/events/touch-event-integ.h>
*/
#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/adaptor
s
/scene-holder.h>
+#include <dali/integration-api/adaptor
-framework
/scene-holder.h>
#include <toolkit-scene-holder-impl.h>
#include <toolkit-scene-holder-impl.h>
@@
-25,7
+25,7
@@
#include <dali/public-api/common/stage.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/common/stage.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/integration-api/adaptor
s
/adaptor.h>
+#include <dali/integration-api/adaptor
-framework
/adaptor.h>
#include <toolkit-adaptor-impl.h>
using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
#include <toolkit-adaptor-impl.h>
using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
@@
-66,7
+66,7
@@
void SceneHolder::Add( Dali::Actor actor )
void SceneHolder::Remove( Dali::Actor actor )
{
void SceneHolder::Remove( Dali::Actor actor )
{
- mScene.
Add
( actor );
+ mScene.
Remove
( actor );
}
Dali::Layer SceneHolder::GetRootLayer() const
}
Dali::Layer SceneHolder::GetRootLayer() const