Merge "Add SetWindowEffect in WindowExtension namespace." into tizen

[platform/core/uifw/dali-adaptor.git] / adaptors / common / adaptor.cpp

diff --git a/adaptors/common/adaptor.cpp b/adaptors/common/adaptor.cpp
index 1f54f67..b71b210 100644 (file)
--- a/adaptors/common/adaptor.cpp
+++ b/adaptors/common/adaptor.cpp
@@ -20,12 +20,12 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
 #include <accessibility-manager.h>
 #include <imf-manager.h>
 #include <style-monitor.h>
 #include <window.h>
-
-// INTERNAL INCLUDES
 #include <adaptor-impl.h>
 #include <render-surface-impl.h>
 #include <window-impl.h>
@@ -35,13 +35,13 @@ namespace Dali
 
 Adaptor& Adaptor::New( Window window )
 {
-  return New( window, DeviceLayout::DEFAULT_BASE_LAYOUT );
+  return New( window, DeviceLayout::DEFAULT_BASE_LAYOUT, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS );
 }
 
-Adaptor& Adaptor::New( Window window, const DeviceLayout& baseLayout )
+Adaptor& Adaptor::New( Window window, const DeviceLayout& baseLayout, Configuration::ContextLoss configuration )
 {
   Internal::Adaptor::Window& windowImpl = GetImplementation(window);
-  Adaptor* adaptor = Internal::Adaptor::Adaptor::New( windowImpl.GetSurface(), baseLayout );
+  Adaptor* adaptor = Internal::Adaptor::Adaptor::New( windowImpl.GetSurface(), baseLayout, configuration );
   windowImpl.SetAdaptor(*adaptor);
   return *adaptor;
 }
@@ -71,17 +71,17 @@ void Adaptor::Stop()
   mImpl->Stop();
 }
 
-bool Adaptor::AddIdle( boost::function<void(void)> callBack )
+bool Adaptor::AddIdle( CallbackBase* callback )
 {
-  return mImpl->AddIdle(callBack);
+  return mImpl->AddIdle( callback );
 }
 
-Adaptor::AdaptorSignalV2& Adaptor::ResizedSignal()
+Adaptor::AdaptorSignalType& Adaptor::ResizedSignal()
 {
   return mImpl->ResizedSignal();
 }
 
-Adaptor::AdaptorSignalV2& Adaptor::LanguageChangedSignal()
+Adaptor::AdaptorSignalType& Adaptor::LanguageChangedSignal()
 {
   return mImpl->LanguageChangedSignal();
 }
@@ -91,24 +91,29 @@ RenderSurface& Adaptor::GetSurface()
   return mImpl->GetSurface();
 }
 
-Adaptor& Adaptor::Get()
+void Adaptor::ReleaseSurfaceLock()
 {
-  return Internal::Adaptor::Adaptor::Get();
+  mImpl->ReleaseSurfaceLock();
 }
 
-bool Adaptor::IsAvailable()
+void Adaptor::SetRenderRefreshRate( unsigned int numberOfVSyncsPerRender )
 {
-  return Internal::Adaptor::Adaptor::IsAvailable();
+  mImpl->SetRenderRefreshRate( numberOfVSyncsPerRender );
 }
 
-void Adaptor::RegisterSingleton(const std::type_info& info, BaseHandle singleton)
+void Adaptor::SetUseHardwareVSync(bool useHardware)
 {
-  mImpl->RegisterSingleton(info, singleton);
+  mImpl->SetUseHardwareVSync( useHardware );
 }
 
-BaseHandle Adaptor::GetSingleton(const std::type_info& info) const
+Adaptor& Adaptor::Get()
 {
-  return mImpl->GetSingleton(info);
+  return Internal::Adaptor::Adaptor::Get();
+}
+
+bool Adaptor::IsAvailable()
+{
+  return Internal::Adaptor::Adaptor::IsAvailable();
 }
 
 void Adaptor::NotifyLanguageChanged()