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
[Tizen]Revert "Support multiple window rendering"
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-adaptor.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
index
5d6cf4e
..
dcf0560
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
@@
-23,7
+23,6
@@
#include <toolkit-adaptor-impl.h>
#include <dali/integration-api/debug.h>
#include <test-application.h>
#include <toolkit-adaptor-impl.h>
#include <dali/integration-api/debug.h>
#include <test-application.h>
-#include <test-render-surface.h>
namespace Dali
{
namespace Dali
{
@@
-43,9
+42,9
@@
Dali::Adaptor& Adaptor::Get()
return *adaptor;
}
return *adaptor;
}
-Dali::RenderSurface
Interface
& Adaptor::GetSurface()
+Dali::RenderSurface& Adaptor::GetSurface()
{
{
- Dali::RenderSurface
Interface* renderSurface = reinterpret_cast <Dali::RenderSurfaceInterface*>( new Dali::TestRenderSurface( Dali::PositionSize( 0, 0, 480, 800 ) ) )
;
+ Dali::RenderSurface
*renderSurface = new Dali::TestRenderSurface
;
return *renderSurface;
}
return *renderSurface;
}
@@
-68,12
+67,12
@@
Adaptor& Adaptor::New( Window window, Configuration::ContextLoss configuration )
return Internal::Adaptor::Adaptor::Get();
}
return Internal::Adaptor::Adaptor::Get();
}
-Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface
Interface
& surface )
+Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface& surface )
{
return Internal::Adaptor::Adaptor::Get();
}
{
return Internal::Adaptor::Adaptor::Get();
}
-Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface
Interface
& surface, Configuration::ContextLoss configuration )
+Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface& surface, Configuration::ContextLoss configuration )
{
return Internal::Adaptor::Adaptor::Get();
}
{
return Internal::Adaptor::Adaptor::Get();
}
@@
-130,7
+129,7
@@
void Adaptor::RemoveIdle( CallbackBase* callback )
}
}
}
}
-void Adaptor::ReplaceSurface( Any nativeWindow, Dali::RenderSurface
Interface
& surface )
+void Adaptor::ReplaceSurface( Any nativeWindow, Dali::RenderSurface& surface )
{
}
{
}
@@
-144,7
+143,7
@@
Adaptor::AdaptorSignalType& Adaptor::LanguageChangedSignal()
return Internal::Adaptor::Adaptor::AdaptorSignal();
}
return Internal::Adaptor::Adaptor::AdaptorSignal();
}
-
Dali::RenderSurfaceInte
rface& Adaptor::GetSurface()
+
RenderSu
rface& Adaptor::GetSurface()
{
return Internal::Adaptor::Adaptor::GetSurface();
}
{
return Internal::Adaptor::Adaptor::GetSurface();
}