[Web] Fix "undefined symbol: elm_init" error

Since elm_init symbol not founded before ewk_context_default_get() API called,
Let we use WebEngineManager::IsAvailable() API don't call
WebEngineManager::Get() API.

Change-Id: I3bd2819f03b90fc31418e21bff3857606300dfcb
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-manager.cpp b/dali-extension/web-engine-chromium/tizen-web-engine-manager.cpp
index 17f8303..fc7e264 100644 (file)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-manager.cpp
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-manager.cpp
@@ -33,6 +33,12 @@ namespace Dali
 {
 namespace Plugin
 {
+namespace
+{
+// @todo : If we make this value as member of WebEngineManager, we got crashed due to 'elm_init' symbol found failed.
+static bool gWebEngineManagerAvailable = true; // Default as true
+} // namespace
+
 WebEngineManager& WebEngineManager::Get()
 {
   static WebEngineManager instance;
@@ -41,13 +47,14 @@ WebEngineManager& WebEngineManager::Get()
 
 bool WebEngineManager::IsAvailable()
 {
-  return Get().mWebEngineManagerAvailable;
+  return gWebEngineManagerAvailable;
 }
 
 WebEngineManager::WebEngineManager()
-: mSlotDelegate(this),
-  mWebEngineManagerAvailable(true)
+: mSlotDelegate(this)
 {
+  DALI_LOG_RELEASE_INFO("#WebEngineManager is created.\n");
+
   elm_init(0, 0);
   ewk_init();
   mWindow = ecore_evas_new("wayland_egl", 0, 0, 1, 1, 0);
@@ -58,11 +65,13 @@ WebEngineManager::WebEngineManager()
   Ewk_Cookie_Manager* manager = ewk_context_cookie_manager_get(context);
   mWebEngineCookieManager.reset(new TizenWebEngineCookieManager(manager));
   Dali::LifecycleController::Get().TerminateSignal().Connect(mSlotDelegate, &WebEngineManager::OnTerminated);
+
+  DALI_LOG_RELEASE_INFO("#WebEngineManager is created fully.\n");
 }
 
 WebEngineManager::~WebEngineManager()
 {
-  if(mWebEngineManagerAvailable)
+  if(gWebEngineManagerAvailable)
   {
     // Call OnTerminated directly.
     OnTerminated();
@@ -114,13 +123,14 @@ Dali::WebEnginePlugin* WebEngineManager::Find(Evas_Object* webView)
 void WebEngineManager::OnTerminated()
 {
   // Ignore duplicated termination
-  if(DALI_UNLIKELY(!mWebEngineManagerAvailable))
+  if(DALI_UNLIKELY(!gWebEngineManagerAvailable))
   {
     return;
   }
+  DALI_LOG_RELEASE_INFO("#WebEngineManager is destroyed.\n");
 
   // App is terminated. Now web engine is not available anymore.
-  mWebEngineManagerAvailable = false;
+  gWebEngineManagerAvailable = false;
 
   for(auto it = mWebEngines.begin(); it != mWebEngines.end(); it++)
   {

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-manager.h b/dali-extension/web-engine-chromium/tizen-web-engine-manager.h
index b6a9362..e19ca7f 100644 (file)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-manager.h
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-manager.h
@@ -70,7 +70,6 @@ private:
   std::unique_ptr<WebEngineCookieManager>        mWebEngineCookieManager;
   Ecore_Evas*                                    mWindow;
   std::map<Evas_Object*, Dali::WebEnginePlugin*> mWebEngines;
-  bool                                           mWebEngineManagerAvailable;
 };
 
 } // namespace Plugin