Fix issues supporting EvasPlugin

* DisplayConnection must have valid mDisplay by generating tbm dummy display.
  (unless, eglCreateWindowSurface fail)
* To implement new SceneHolder class for EvasPlugin, SceneHolder base must be visible

Change-Id: I13af9b47968c027f75828a42cc6fd86dbb5e8b3c
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/dali/integration-api/scene-holder-impl.h b/dali/integration-api/scene-holder-impl.h
index 12c5432..25a5b91 100644 (file)
--- a/dali/integration-api/scene-holder-impl.h
+++ b/dali/integration-api/scene-holder-impl.h
@@ -71,7 +71,7 @@ using SceneHolderPtr = IntrusivePtr< SceneHolder >;
 /**
  * @brief SceneHolder creates a Scene for rendering.
  */
-class SceneHolder : public BaseObject
+class DALI_ADAPTOR_API SceneHolder : public BaseObject
 {
 
 public:

diff --git a/dali/integration-api/scene-holder.h b/dali/integration-api/scene-holder.h
index 57c648b..59a2055 100644 (file)
--- a/dali/integration-api/scene-holder.h
+++ b/dali/integration-api/scene-holder.h
@@ -157,7 +157,7 @@ public: // Not intended for application developers
    *
    * @param[in] sceneHolder A pointer to a newly allocated Dali resource
    */
-  explicit DALI_INTERNAL SceneHolder( Internal::Adaptor::SceneHolder* sceneHolder );
+  explicit SceneHolder( Internal::Adaptor::SceneHolder* sceneHolder );
 
 };
 

diff --git a/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
index f639ed5..a445c5c 100755 (executable)
--- a/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
@@ -20,6 +20,7 @@
 #include <dali/internal/graphics/gles/egl-graphics.h>
 
 // EXTERNAL_HEADERS
+#include <tbm_dummy_display.h>
 #include <dali/integration-api/debug.h>
 
 #ifdef ECORE_WAYLAND2
@@ -108,12 +109,15 @@ void DisplayConnectionEcoreWl::SetGraphicsInterface( GraphicsInterface& graphics
 
 EGLNativeDisplayType DisplayConnectionEcoreWl::GetNativeDisplay()
 {
-  return EGLNativeDisplayType();
+  return reinterpret_cast< EGLNativeDisplayType >( tbm_dummy_display_create() );
 }
 
 void DisplayConnectionEcoreWl::ReleaseNativeDisplay()
 {
-
+  if( mDisplay )
+  {
+     tbm_dummy_display_destroy( reinterpret_cast< tbm_dummy_display* >( mDisplay ) );
+  }
 }
 
 } // namespace Adaptor