Replace pepper dali with remote surface

[platform/core/uifw/widget-viewer-dali.git] / internal / widget_view_manager / widget_view_manager_impl.cpp

diff --git a/internal/widget_view_manager/widget_view_manager_impl.cpp b/internal/widget_view_manager/widget_view_manager_impl.cpp
index 41092d0..df33581 100644 (file)
--- a/internal/widget_view_manager/widget_view_manager_impl.cpp
+++ b/internal/widget_view_manager/widget_view_manager_impl.cpp
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <widget_errno.h>
 #include <widget_instance.h>
+#include <aul_rsm_viewer.h>
 
 namespace Dali
 {
@@ -137,6 +138,7 @@ WidgetViewManager::WidgetViewManager()
 
 WidgetViewManager::~WidgetViewManager()
 {
+  aul_rsm_viewer_fini();
   widget_instance_unlisten_event( WidgetViewManager::WidgetEventCallback );
   widget_instance_fini();
 }
@@ -155,11 +157,11 @@ int WidgetViewManager::Initialize( Application application, const std::string& n
     return WIDGET_ERROR_PERMISSION_DENIED;
   }
 
-  // create compositor
-  mCompositor = Pepper::Compositor::New( application, name );
-
-  mCompositor.ObjectViewAddedSignal().Connect( this, &WidgetViewManager::OnObjectViewAdded );
-  mCompositor.ObjectViewDeletedSignal().Connect( this, &WidgetViewManager::OnObjectViewDeleted );
+  // Binds tizen remote surface manager & connects callback
+  if( aul_rsm_viewer_init() < 0 )
+  {
+    return WIDGET_ERROR_FAULT;
+  }
 
   // init widget service
   widget_instance_init( name.c_str() );
@@ -167,8 +169,6 @@ int WidgetViewManager::Initialize( Application application, const std::string& n
 
   DALI_LOG_INFO( gWidgetViewManagerLogging, Debug::Verbose, "WidgetViewManager::Initialize: success.\n" );
 
-  setenv("WAYLAND_DISPLAY", mCompositor.GetName().c_str(), 1);
-
   return WIDGET_ERROR_NONE;
 }
 
@@ -190,45 +190,6 @@ Dali::WidgetView::WidgetView WidgetViewManager::AddWidget( const std::string& wi
   return widgetView;
 }
 
-void WidgetViewManager::OnObjectViewAdded( Pepper::Compositor compositor, Pepper::ObjectView objectView )
-{
-  std::string appId = objectView.GetAppId();  // widget instance id
-
-  if( mWidgetViewContainer.size() > 0)
-  {
-    WidgetViewIter iter = mWidgetViewContainer.find( appId );
-    if( iter != mWidgetViewContainer.end() )
-    {
-      Dali::WidgetView::WidgetView widgetView = iter->second;
-
-      Dali::WidgetView::GetImplementation( widgetView ).AddObjectView( objectView );
-    }
-  }
-
-  DALI_LOG_INFO( gWidgetViewManagerLogging, Debug::Verbose, "WidgetViewManager::OnObjectViewAdded: ObjectView is added!\n" );
-}
-
-void WidgetViewManager::OnObjectViewDeleted( Pepper::Compositor compositor, Pepper::ObjectView objectView )
-{
-  std::string appId = objectView.GetAppId();  // widget instance id
-
-  // Remove from map
-  if( mWidgetViewContainer.size() > 0)
-  {
-    WidgetViewIter iter = mWidgetViewContainer.find( appId );
-    if( iter != mWidgetViewContainer.end() )
-    {
-      Dali::WidgetView::WidgetView widgetView = iter->second;
-
-      Dali::WidgetView::GetImplementation( widgetView ).RemoveObjectView();
-
-      mWidgetViewContainer.erase( iter );
-    }
-  }
-
-  DALI_LOG_INFO( gWidgetViewManagerLogging, Debug::Verbose, "WidgetViewManager::OnObjectViewDeleted: ObjectView is deleted!\n" );
-}
-
 int WidgetViewManager::WidgetEventCallback( const char* widgetId, const char* instanceId, int event, void* data )
 {
   WidgetViewManager* widgetViewManager = static_cast< WidgetViewManager* >( data );