projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove RenderSurface from Core
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
adaptor
/
common
/
adaptor.cpp
diff --git
a/dali/internal/adaptor/common/adaptor.cpp
b/dali/internal/adaptor/common/adaptor.cpp
index
9b300bf
..
3915b68
100755
(executable)
--- a/
dali/internal/adaptor/common/adaptor.cpp
+++ b/
dali/internal/adaptor/common/adaptor.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-16,7
+16,7
@@
*/
// CLASS HEADER
*/
// CLASS HEADER
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/adaptor
-framework/adaptor
.h>
// EXTERNAL INCLUDES
#include <dali/integration-api/debug.h>
// EXTERNAL INCLUDES
#include <dali/integration-api/debug.h>
@@
-24,16
+24,11
@@
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
#include <dali/devel-api/adaptor-framework/style-monitor.h>
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
#include <dali/devel-api/adaptor-framework/style-monitor.h>
-#include <dali/integration-api/render-surface.h>
+#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/window-system/common/window-impl.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/window-system/common/window-impl.h>
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder.h>
-#else
-#include <dali/integration-api/adaptors/scene-holder.h>
-#endif
-
namespace Dali
{
namespace Dali
{
@@
-161,6
+156,11
@@
Any Adaptor::GetNativeWindowHandle()
return mImpl->GetNativeWindowHandle();
}
return mImpl->GetNativeWindowHandle();
}
+Any Adaptor::GetNativeWindowHandle( Actor actor )
+{
+ return mImpl->GetNativeWindowHandle( actor );
+}
+
Any Adaptor::GetGraphicsDisplay()
{
return mImpl->GetGraphicsDisplay();
Any Adaptor::GetGraphicsDisplay()
{
return mImpl->GetGraphicsDisplay();
@@
-256,6
+256,11
@@
Dali::WindowContainer Adaptor::GetWindows() const
return mImpl->GetWindows();
}
return mImpl->GetWindows();
}
+SceneHolderList Adaptor::GetSceneHolders() const
+{
+ return mImpl->GetSceneHolders();
+}
+
void Adaptor::OnWindowShown()
{
mImpl->OnWindowShown();
void Adaptor::OnWindowShown()
{
mImpl->OnWindowShown();