Replace web notification API

[Issue#] N/A
[Problem] N/A
[Cause] Webkit API for web notification is changed
[Solution] Replace webkit API for web notification
[SCMRequest] must imported with webkit packages

Change-Id: Ie6dbbc47ac8f1fed8fba55eb24d9c35d63528131

diff --git a/src/view/webkit/view_logic.cpp b/src/view/webkit/view_logic.cpp
index ac72511..a2f3f4b 100644 (file)
--- a/src/view/webkit/view_logic.cpp
+++ b/src/view/webkit/view_logic.cpp
@@ -1271,8 +1271,7 @@ void ViewLogic::notificationPermissionRequestCallback(
     {
         Ewk_Notification_Permission_Request* request =
             static_cast<Ewk_Notification_Permission_Request*>(eventInfo);
-        ewk_notification_permission_request_response(
-            This->m_ewkContext,
+        ewk_notification_permission_request_set(
             request,
             EINA_FALSE);
         return;
@@ -1282,7 +1281,6 @@ void ViewLogic::notificationPermissionRequestCallback(
     ViewModule::WebNotification::webNotificationPermissionRequest(
         This->m_window,
         This->m_securityOriginSupport->getSecurityOriginDAO(),
-        This->m_ewkContext,
         eventInfo);
     return;
 }

diff --git a/src/view/webkit/view_logic_web_notification_support.cpp b/src/view/webkit/view_logic_web_notification_support.cpp
index e0f840c..2284dbe 100644 (file)
--- a/src/view/webkit/view_logic_web_notification_support.cpp
+++ b/src/view/webkit/view_logic_web_notification_support.cpp
@@ -47,25 +47,6 @@ namespace WebNotification {
 using namespace SecurityOriginDB;
 using namespace ViewModule::SecurityOriginSupportUtil;
 
-class WebNotificationPermissionData :
-    public ViewModule::SecurityOriginSupportUtil::PermissionData
-{
-  public:
-    Ewk_Context* m_ewkContext;
-
-    WebNotificationPermissionData(
-        SecurityOriginDB::SecurityOriginDAO* originDao,
-        SecurityOriginDB::SecurityOriginData originData,
-        Ewk_Context* ewkContext,
-        void* data) :
-        ViewModule::SecurityOriginSupportUtil::PermissionData(
-            originDao,
-            originData,
-            data),
-        m_ewkContext(ewkContext)
-    {}
-};
-
 bool notificationShow(WebNotificationDataPtr notiData);
 bool notificationHide(WebNotificationDataPtr notiData);
 bool isExternalUri(const std::string &pattern, const std::string &uri);
@@ -73,7 +54,7 @@ bool downloadImage(WebNotificationDataPtr notiData);
 size_t curlWriteData(void *ptr, size_t size, size_t nmemb, FILE *stream);
 void askUserForWebNotificationPermission(
     Evas_Object* window,
-    WebNotificationPermissionData* data);
+    PermissionData* data);
 static void popupCallback(void* data, Evas_Object* obj, void* eventInfo);
 
 WebNotificationData::WebNotificationData(WidgetModel* widgetModel,
@@ -90,7 +71,6 @@ WebNotificationData::~WebNotificationData()
 void webNotificationPermissionRequest(
     Evas_Object* window,
     SecurityOriginDAO* securityOriginDAO,
-    Ewk_Context* ewkContext,
     void* data)
 {
     LogDebug("permissionRequest called");
@@ -113,24 +93,19 @@ void webNotificationPermissionRequest(
     Result result = securityOriginDAO->getResult(securityOriginData);
     if (RESULT_ALLOW_ONCE == result || RESULT_ALLOW_ALWAYS == result) {
         LogDebug("allow");
-        ewk_notification_permission_request_response(ewkContext,
-                                                     request,
-                                                     EINA_TRUE);
+        ewk_notification_permission_request_set(request, EINA_TRUE);
         return;
     } else if (RESULT_DENY_ONCE == result || RESULT_DENY_ALWAYS == result) {
         LogDebug("deny");
-        ewk_notification_permission_request_response(ewkContext,
-                                                     request,
-                                                     EINA_FALSE);
+        ewk_notification_permission_request_set(request, EINA_FALSE);
         return;
     }
 
     // ask to user
-    WebNotificationPermissionData* permissionData =
-        new WebNotificationPermissionData(securityOriginDAO,
-                                          securityOriginData,
-                                          ewkContext,
-                                          data);
+    PermissionData* permissionData =
+        new PermissionData(securityOriginDAO,
+                           securityOriginData,
+                           request);
 
     // suspend notification
     ewk_notification_permission_request_suspend(request);
@@ -337,7 +312,7 @@ size_t curlWriteData(void *ptr, size_t size, size_t nmemb, FILE *stream)
 
 void askUserForWebNotificationPermission(
     Evas_Object* window,
-    WebNotificationPermissionData* data)
+    PermissionData* data)
 {
     LogDebug("askUserForWebNotificationPermission called");
     std::string body =
@@ -362,8 +337,7 @@ void popupCallback(void* data, Evas_Object* obj, void* /*eventInfo*/)
 {
     LogDebug("popupCallback");
     Assert(data);
-    WebNotificationPermissionData* permData =
-        static_cast<WebNotificationPermissionData*>(data);
+    PermissionData* permData = static_cast<PermissionData*>(data);
     Ewk_Notification_Permission_Request* request =
         static_cast<Ewk_Notification_Permission_Request*>(permData->m_data);
 
@@ -377,9 +351,7 @@ void popupCallback(void* data, Evas_Object* obj, void* /*eventInfo*/)
     Eina_Bool ret =
         (result == RESULT_ALLOW_ALWAYS || result == RESULT_ALLOW_ONCE) ?
         EINA_TRUE : EINA_FALSE;
-    ewk_notification_permission_request_response(permData->m_ewkContext,
-                                                 request,
-                                                 ret);
+    ewk_notification_permission_request_set(request, ret);
     delete permData;
     evas_object_hide(popup);
     evas_object_del(popup);

diff --git a/src/view/webkit/view_logic_web_notification_support.h b/src/view/webkit/view_logic_web_notification_support.h
index de37cac..74c0d17 100644 (file)
--- a/src/view/webkit/view_logic_web_notification_support.h
+++ b/src/view/webkit/view_logic_web_notification_support.h
@@ -24,8 +24,8 @@
 
 #include <memory>
 #include <stdint.h>
+#include <Elementary.h>
 #include <dpl/exception.h>
-#include <EWebKit2.h>
 
 //Forward declarations
 class WidgetModel;
@@ -63,7 +63,6 @@ class Exception
 void webNotificationPermissionRequest(
     Evas_Object* window,
     SecurityOriginDB::SecurityOriginDAO* securityOriginDAO,
-    Ewk_Context* ewkContext,
     void* data);
 bool showWebNotification(WebNotificationDataPtr notiData);
 } // namespace SecuritySupport