Merge branch 'devel/master' into tizen

[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
old mode 100644 (file)
new mode 100755 (executable)
index b8cf1b1..377a031
--- a/dali/internal/adaptor/common/adaptor.cpp
+++ b/dali/internal/adaptor/common/adaptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -23,9 +23,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
-#include <dali/devel-api/adaptor-framework/imf-manager.h>
 #include <dali/devel-api/adaptor-framework/style-monitor.h>
-#include <dali/devel-api/adaptor-framework/render-surface.h>
+#include <dali/integration-api/render-surface.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 
 namespace Dali
@@ -79,9 +78,9 @@ void Adaptor::Stop()
   mImpl->Stop();
 }
 
-bool Adaptor::AddIdle( CallbackBase* callback )
+bool Adaptor::AddIdle( CallbackBase* callback, bool hasReturnValue )
 {
-  return mImpl->AddIdle( callback, false );
+  return mImpl->AddIdle( callback, hasReturnValue, false );
 }
 
 void Adaptor::RemoveIdle( CallbackBase* callback )
@@ -114,6 +113,11 @@ Any Adaptor::GetNativeWindowHandle()
   return mImpl->GetNativeWindowHandle();
 }
 
+Any Adaptor::GetGraphicsDisplay()
+{
+  return mImpl->GetGraphicsDisplay();
+}
+
 void Adaptor::ReleaseSurfaceLock()
 {
   mImpl->ReleaseSurfaceLock();
@@ -124,6 +128,11 @@ void Adaptor::SetRenderRefreshRate( unsigned int numberOfVSyncsPerRender )
   mImpl->SetRenderRefreshRate( numberOfVSyncsPerRender );
 }
 
+void Adaptor::SetPreRenderCallback( CallbackBase* callback )
+{
+  mImpl->SetPreRenderCallback( callback );
+}
+
 void Adaptor::SetUseHardwareVSync(bool useHardware)
 {
   mImpl->SetUseHardwareVSync( useHardware );
@@ -174,19 +183,24 @@ void Adaptor::SceneCreated()
   mImpl->SceneCreated();
 }
 
-void Adaptor::SetViewMode( ViewMode mode )
+void Adaptor::RenderOnce()
 {
-  mImpl->SetViewMode( mode );
+  mImpl->RenderOnce();
 }
 
-void Adaptor::SetStereoBase(  float stereoBase )
+const LogFactoryInterface& Adaptor::GetLogFactory()
 {
-  mImpl->SetStereoBase( stereoBase );
+  return mImpl->GetLogFactory();
 }
 
-void Adaptor::RenderOnce()
+void Adaptor::RegisterProcessor( Integration::Processor& processor )
 {
-  mImpl->RenderOnce();
+  mImpl->RegisterProcessor( processor );
+}
+
+void Adaptor::UnregisterProcessor( Integration::Processor& processor )
+{
+  mImpl->UnregisterProcessor( processor );
 }
 
 Adaptor::Adaptor()