Implement "create,window", "close,window"

Change-Id: I6ebf340c3d35ff3c75eadb3ebdba99cb35338f25

diff --git a/packaging/wrt.spec b/packaging/wrt.spec
index 7efc609f652225762737552c07291fdf005a22df..d3ba278b1207045f17a48b3ac0d1ba33ede56132 100755 (executable)
--- a/packaging/wrt.spec
+++ b/packaging/wrt.spec
@@ -27,6 +27,7 @@ BuildRequires: pkgconfig(cert-svc)
 BuildRequires: pkgconfig(uuid)
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(aul)
+BuildRequires: pkgconfig(ecore)
 BuildRequires: boost-devel
 %if %{with x}
 BuildRequires: pkgconfig(ecore-x)

diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
index d6cd9ed858ead3e8a38b5ddb0709cc5b7f512ecb..c69904c89e171eeac18795e20f1694eeb66227e4 100755 (executable)
--- a/src/runtime/CMakeLists.txt
+++ b/src/runtime/CMakeLists.txt
@@ -28,6 +28,7 @@ PKG_CHECK_MODULES(TARGET_RUNTIME_DEPS
   deviced
   capi-system-runtime-info
   aul
+  ecore
   REQUIRED
 )
 

diff --git a/src/runtime/web_application.cc b/src/runtime/web_application.cc
index 229b8615fe4014ea8c6c5e739b6bef02c8b909aa..989e73a02f9ff0cbe38dae5ee6a98900da3f209c 100755 (executable)
--- a/src/runtime/web_application.cc
+++ b/src/runtime/web_application.cc
@@ -5,6 +5,7 @@
 #include "runtime/web_application.h"
 
 #include <app.h>
+#include <Ecore.h>
 #include <ewk_chromium.h>
 #include <algorithm>
 #include <memory>
@@ -295,7 +296,12 @@ void WebApplication::OnClosedWebView(WebView * view) {
     window_->SetContent(view_stack_.front()->evas_object());
   }
 
-  delete view;
+  // Delete after the callback context(for ewk view) was not used
+  ecore_idler_add([](void* view) {
+      WebView* obj = static_cast<WebView*>(view);
+      delete view;
+      return EINA_FALSE;
+    }, view);
 }
 
 void WebApplication::OnReceivedWrtMessage(
@@ -404,7 +410,7 @@ void WebApplication::SetupWebView(WebView* view) {
   // TODO(sngn.lee): set CSP
 }
 
-bool OnDidNavigation(WebView* view, const std::string& url) {
+bool WebApplication::OnDidNavigation(WebView* view, const std::string& url) {
   // TODO(sngn.lee): scheme handling
   // except(file , http, https, app) pass to appcontrol and return false
   return true;

diff --git a/src/runtime/web_view_impl.cc b/src/runtime/web_view_impl.cc
index bce6e475e165e38e5084ae41a00df0380c2f9237..15a9b94a7dd9df859112aaa43cc1faca0730a2ee 100755 (executable)
--- a/src/runtime/web_view_impl.cc
+++ b/src/runtime/web_view_impl.cc
@@ -94,6 +94,7 @@ void WebViewImpl::Initialize() {
   InitConsoleMessageCallback();
   InitCustomContextMenuCallback();
   InitRotationCallback();
+  InitWindowCreateCallback();
 
   // TODO(sngn.lee): "request,certificate,confirm" certification popup
   // TODO(sngn.lee): ewk_view_notification_permission_callback_set
@@ -448,6 +449,40 @@ void WebViewImpl::InitRotationCallback() {
                                   std::placeholders::_1));
 }
 
+void WebViewImpl::InitWindowCreateCallback() {
+  auto create_callback = [](void* user_data,
+                            Evas_Object*,
+                            void* event_info) {
+    WebViewImpl* self = static_cast<WebViewImpl*>(user_data);
+    if (!self->listener_) {
+      return;
+    }
+    WebView* new_view = new WebView(self->window_, self->context_);
+    self->listener_->OnCreatedNewWebView(self->view_, new_view);
+  };
+
+  auto close_callback = [](void* user_data,
+                            Evas_Object*,
+                            void*) {
+    WebViewImpl* self = static_cast<WebViewImpl*>(user_data);
+    if (!self->listener_) {
+      return;
+    }
+    self->listener_->OnClosedWebView(self->view_);
+  };
+  evas_object_smart_callback_add(ewk_view_,
+                                 "create,window",
+                                 create_callback,
+                                 this);
+  evas_object_smart_callback_add(ewk_view_,
+                                 "close,window",
+                                 close_callback,
+                                 this);
+
+  smart_callbacks_["create,window"] = create_callback;
+  smart_callbacks_["close,window"] = close_callback;
+}
+
 std::string WebViewImpl::GetUrl() {
   return std::string(ewk_view_url_get(ewk_view_));
 }

diff --git a/src/runtime/web_view_impl.h b/src/runtime/web_view_impl.h
index 3a89b9667cb67aaa1a4a9300fb2f98c7041550f4..a83c6d2ae7d0200462cb86aab3f82a0e8b314649 100755 (executable)
--- a/src/runtime/web_view_impl.h
+++ b/src/runtime/web_view_impl.h
@@ -51,6 +51,7 @@ class WebViewImpl {
   void InitConsoleMessageCallback();
   void InitCustomContextMenuCallback();
   void InitRotationCallback();
+  void InitWindowCreateCallback();
 
   NativeWindow* window_;
   Ewk_Context* context_;