Add component based type

Widget viewer has to deal with widget app and widget component.
So viewer use type that is expressed bellow.
Please refer to the bellow patch.

https://review.tizen.org/gerrit/c/platform/core/appfw/screen-connector/+/249753

Change-Id: Ibfc6cef6d6a1daaa41e4329d8353f19a862e981d
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index 5d400efadb35ffddd3ba12eac627d8da4f0791a5..d809fea66e696d36f62bc2157f07304e3ee45995 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -567,7 +567,7 @@ void WidgetView::ActivateFaultedWidget()
     ops.updated_cb = OnBufferUpdated;
     ops.removed_cb = OnSurfaceRemoved;
     ops.added_cb = OnBufferAdded;
-    mWatcherHandle = screen_connector_toolkit_add(&ops, (char *)mInstanceId.c_str(), SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET, this);
+    mWatcherHandle = screen_connector_toolkit_add(&ops, (char *)mInstanceId.c_str(), static_cast<screen_connector_screen_type_e>(static_cast<screen_connector_screen_type_e>(SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET | SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED)), this);
     DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::ActivateFaultedWidget: widget_instance_launch is called. [%s, mPid = %d]\n", mWidgetId.c_str(), mPid );
   }
 }
@@ -1110,7 +1110,7 @@ void WidgetView::OnInitialize()
   ops.updated_cb = OnBufferUpdated;
   ops.removed_cb = OnSurfaceRemoved;
   ops.added_cb = OnBufferAdded;
-  mWatcherHandle = screen_connector_toolkit_add(&ops, (char *)instanceId, SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET, this);
+  mWatcherHandle = screen_connector_toolkit_add(&ops, (char *)instanceId, static_cast<screen_connector_screen_type_e>(SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET | SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED), this);
   DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::OnInitialize: widget_instance_launch is called. [%s, mPid = %d]\n", mWidgetId.c_str(), mPid );
 }
 
@@ -1750,7 +1750,7 @@ void WidgetView::ReloadWidget()
     ops.updated_cb = OnBufferUpdated;
     ops.removed_cb = OnSurfaceRemoved;
     ops.added_cb = OnBufferAdded;
-    mWatcherHandle = screen_connector_toolkit_add(&ops, (char *)mInstanceId.c_str(), SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET, this);
+    mWatcherHandle = screen_connector_toolkit_add(&ops, (char *)mInstanceId.c_str(), static_cast<screen_connector_screen_type_e>(SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET | SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED), this);
 
     // launch widget again
     mPid = widget_instance_launch( mInstanceId.c_str(), (char *)mContentInfo.c_str(), mWidth, mHeight );

diff --git a/widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.cpp b/widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.cpp
index ae785839be7c698702260ce77641a5a81df1dc2e..77ae3015b68c238d5d97138c031823b6851e4e80 100644 (file)
--- a/widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.cpp
@@ -146,7 +146,7 @@ WidgetViewManager::WidgetViewManager()
 
 WidgetViewManager::~WidgetViewManager()
 {
-  screen_connector_toolkit_fini(SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET);
+  screen_connector_toolkit_fini( static_cast<screen_connector_screen_type_e>(SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET | SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED) );
   widget_instance_unlisten_event( WidgetViewManager::WidgetEventCallback );
   widget_instance_fini();
 }
@@ -171,7 +171,7 @@ int WidgetViewManager::Initialize( Application application, const std::string& n
   }
 
   // Binds tizen remote surface manager & connects callback
-  if( screen_connector_toolkit_init(SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET) < 0 )
+  if( screen_connector_toolkit_init( static_cast<screen_connector_screen_type_e>(SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET | SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED)) < 0 )
   {
     DALI_LOG_ERROR( "Can't Initialize tizen remote surface.\n");
     return WIDGET_ERROR_FAULT;