Revert "[Tizen] Add screen and client rotation itself function"

[platform/core/uifw/dali-adaptor.git] / dali / integration-api / adaptor-framework / scene-holder-impl.cpp

diff --git a/dali/integration-api/adaptor-framework/scene-holder-impl.cpp b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
index db52a86..e545376 100644 (file)
--- a/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
+++ b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <sys/time.h>
+#include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/integration-api/debug.h>
@@ -48,7 +49,7 @@ namespace
 {
 
 #if defined(DEBUG_ENABLED)
-Integration::Log::Filter* gTouchEventLogFilter  = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_ADAPTOR_EVENTS_TOUCH");
+Debug::Filter* gSceneHolderLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_SCENE_HOLDER" );
 #endif
 
 // Copied from x server
@@ -121,6 +122,7 @@ SceneHolder::SceneHolder()
   mId( mSceneHolderCounter++ ),
   mSurface( nullptr ),
   mAdaptor( nullptr ),
+  mDpi(),
   mIsBeingDeleted( false ),
   mAdaptorStarted( false ),
   mVisible( true )
@@ -186,30 +188,31 @@ Dali::Integration::Scene SceneHolder::GetScene()
   return mScene;
 }
 
+Uint16Pair SceneHolder::GetDpi() const
+{
+  return mDpi;
+}
+
 void SceneHolder::SetSurface(Dali::RenderSurfaceInterface* surface)
 {
   mSurface.reset( surface );
 
   mScene.SurfaceReplaced();
 
-  SurfaceResized( false );
-
-  unsigned int dpiHorizontal, dpiVertical;
-  dpiHorizontal = dpiVertical = 0;
+  SurfaceResized();
 
-  mSurface->GetDpi( dpiHorizontal, dpiVertical );
-  mScene.SetDpi( Vector2( static_cast<float>( dpiHorizontal ), static_cast<float>( dpiVertical ) ) );
+  InitializeDpi();
 
   mSurface->SetAdaptor( *mAdaptor );
+  mSurface->SetScene( mScene );
 
   OnSurfaceSet( surface );
 }
 
-void SceneHolder::SurfaceResized( bool forceUpdate )
+void SceneHolder::SurfaceResized()
 {
   PositionSize surfacePositionSize = mSurface->GetPositionSize();
-  int orientation = mSurface->GetOrientation();
-  mScene.SurfaceResized( static_cast<float>( surfacePositionSize.width ), static_cast<float>( surfacePositionSize.height ), orientation, forceUpdate );
+  mScene.SurfaceResized( static_cast<float>( surfacePositionSize.width ), static_cast<float>( surfacePositionSize.height ) );
 
   GraphicsInterface& graphics = mAdaptor->GetGraphicsInterface();
   EglGraphics* eglGraphics = static_cast<EglGraphics*>(&graphics);
@@ -252,6 +255,8 @@ void SceneHolder::SetAdaptor(Dali::Adaptor& adaptor)
     return;
   }
 
+  DALI_ASSERT_DEBUG(mSurface && "Surface needs to be set before calling this method\n");
+
   mAdaptorStarted = true;
 
   // Create the scene
@@ -264,16 +269,10 @@ void SceneHolder::SetAdaptor(Dali::Adaptor& adaptor)
   // Create an observer for the adaptor lifecycle
   mAdaptor->AddObserver( *mLifeCycleObserver );
 
-  if ( mSurface )
-  {
-    unsigned int dpiHorizontal, dpiVertical;
-    dpiHorizontal = dpiVertical = 0;
-
-    mSurface->GetDpi( dpiHorizontal, dpiVertical );
-    mScene.SetDpi( Vector2( static_cast<float>( dpiHorizontal ), static_cast<float>( dpiVertical ) ) );
+  InitializeDpi();
 
-    mSurface->SetAdaptor( *mAdaptor );
-  }
+  mSurface->SetAdaptor( *mAdaptor );
+  mSurface->SetScene( mScene );
 
   OnAdaptorSet( adaptor );
 }
@@ -306,7 +305,7 @@ void SceneHolder::FeedTouchPoint( Dali::Integration::Point& point, int timeStamp
   Integration::TouchEventCombiner::EventDispatchType type = mCombiner.GetNextTouchEvent(point, timeStamp, touchEvent, hoverEvent);
   if( type != Integration::TouchEventCombiner::DispatchNone )
   {
-    DALI_LOG_INFO( gTouchEventLogFilter, Debug::General, "%d: Device %d: Button state %d (%.2f, %.2f)\n", timeStamp, point.GetDeviceId(), point.GetState(), point.GetScreenPosition().x, point.GetScreenPosition().y );
+    DALI_LOG_INFO( gSceneHolderLogFilter, Debug::Verbose, "%d: Device %d: Button state %d (%.2f, %.2f)\n", timeStamp, point.GetDeviceId(), point.GetState(), point.GetScreenPosition().x, point.GetScreenPosition().y );
 
     // Signals can be emitted while processing core events, and the scene holder could be deleted in the signal callback.
     // Keep the handle alive until the core events are processed.
@@ -358,6 +357,20 @@ void SceneHolder::FeedKeyEvent( Dali::Integration::KeyEvent& keyEvent )
   mAdaptor->ProcessCoreEvents();
 }
 
+void SceneHolder::AddFrameRenderedCallback( std::unique_ptr< CallbackBase > callback, int32_t frameId )
+{
+  mScene.AddFrameRenderedCallback( std::move( callback ), frameId );
+
+  DALI_LOG_INFO( gSceneHolderLogFilter, Debug::General, "SceneHolder::AddFrameRenderedCallback:: Added [%d]\n", frameId );
+}
+
+void SceneHolder::AddFramePresentedCallback( std::unique_ptr< CallbackBase > callback, int32_t frameId )
+{
+  mScene.AddFramePresentedCallback( std::move( callback ), frameId );
+
+  DALI_LOG_INFO( gSceneHolderLogFilter, Debug::General, "SceneHolder::AddFramePresentedCallback:: Added [%d]\n", frameId );
+}
+
 Dali::Integration::SceneHolder SceneHolder::Get( Dali::Actor actor )
 {
   SceneHolder* sceneHolderImpl = nullptr;
@@ -388,6 +401,17 @@ void SceneHolder::Reset()
   mAdaptor->ProcessCoreEvents();
 }
 
+void SceneHolder::InitializeDpi()
+{
+  unsigned int dpiHorizontal, dpiVertical;
+  dpiHorizontal = dpiVertical = 0;
+
+  mSurface->GetDpi( dpiHorizontal, dpiVertical );
+  mScene.SetDpi( Vector2( static_cast<float>( dpiHorizontal ), static_cast<float>( dpiVertical ) ) );
+
+  mDpi.SetX( dpiHorizontal );
+  mDpi.SetY( dpiVertical );
+}
 
 }// Adaptor