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-adaptor-impl.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
index
dd7f469
..
7d6e853
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
@@
-18,7
+18,7
@@
*
*/
*
*/
-#include <dali/integration-api/adaptor
s
/render-surface-interface.h>
+#include <dali/integration-api/adaptor
-framework
/render-surface-interface.h>
namespace Dali
{
namespace Dali
{
@@
-41,6
+41,7
@@
namespace Adaptor
{
class GraphicsInterface;
{
class GraphicsInterface;
+class SceneHolder;
} // namespace Adaptor
} // namespace Adaptor
@@
-76,6
+77,11
@@
public:
Dali::RenderSurfaceInterface& GetSurface();
Dali::WindowContainer GetWindows();
Dali::RenderSurfaceInterface& GetSurface();
Dali::WindowContainer GetWindows();
+ Dali::SceneHolderList GetSceneHolders();
+
+ Dali::Internal::Adaptor::SceneHolder* GetWindow( Dali::Actor& actor );
+ void AddWindow( Internal::Adaptor::SceneHolder* window );
+ void RemoveWindow( Internal::Adaptor::SceneHolder* window );
Dali::Adaptor::AdaptorSignalType& ResizedSignal();
Dali::Adaptor::AdaptorSignalType& LanguageChangedSignal();
Dali::Adaptor::AdaptorSignalType& ResizedSignal();
Dali::Adaptor::AdaptorSignalType& LanguageChangedSignal();
@@
-87,7
+93,7
@@
public:
private:
Vector<CallbackBase*> mCallbacks;
private:
Vector<CallbackBase*> mCallbacks;
-
Dali::WindowContainer
mWindows;
+
std::vector<Internal::Adaptor::SceneHolder*>
mWindows;
Dali::Adaptor::AdaptorSignalType mResizedSignal;
Dali::Adaptor::AdaptorSignalType mLanguageChangedSignal;
Dali::Adaptor::WindowCreatedSignalType mWindowCreatedSignal;
Dali::Adaptor::AdaptorSignalType mResizedSignal;
Dali::Adaptor::AdaptorSignalType mLanguageChangedSignal;
Dali::Adaptor::WindowCreatedSignalType mWindowCreatedSignal;