Changeset 127848 in webkit

Timestamp:

Sep 7, 2012 2:59:59 AM (12 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Unreviewed, rolling out r127839.
​http://trac.webkit.org/changeset/127839
​https://bugs.webkit.org/show_bug.cgi?id=90603

This patch was landed with wrong implementation and policy.

• WebCoreSupport/NotificationPresenterClientEfl.cpp:

(WebCore::NotificationPresenterClientEfl::NotificationPresenterClientEfl):
(WebCore::NotificationPresenterClientEfl::requestPermission):
(WebCore::NotificationPresenterClientEfl::checkPermission):
(WebCore::NotificationPresenterClientEfl::cancelRequestsForPermission):

• WebCoreSupport/NotificationPresenterClientEfl.h:

(NotificationPresenterClientEfl):

• ewk/ewk_view.cpp:

(_ewk_view_priv_new):

• ewk/ewk_view.h:
• ewk/ewk_view_private.h:

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/NotificationPresenterClientEfl.cpp (modified) (2 diffs)
• WebCoreSupport/NotificationPresenterClientEfl.h (modified) (2 diffs)
• ewk/ewk_view.cpp (modified) (3 diffs)
• ewk/ewk_view.h (modified) (2 diffs)
• ewk/ewk_view_private.h (modified) (1 diff)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-09-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Unreviewed, rolling out r127839.
+        http://trac.webkit.org/changeset/127839
+        https://bugs.webkit.org/show_bug.cgi?id=90603
+
+        This patch was landed with wrong implementation and policy.
+
+        * WebCoreSupport/NotificationPresenterClientEfl.cpp:
+        (WebCore::NotificationPresenterClientEfl::NotificationPresenterClientEfl):
+        (WebCore::NotificationPresenterClientEfl::requestPermission):
+        (WebCore::NotificationPresenterClientEfl::checkPermission):
+        (WebCore::NotificationPresenterClientEfl::cancelRequestsForPermission):
+        * WebCoreSupport/NotificationPresenterClientEfl.h:
+        (NotificationPresenterClientEfl):
+        * ewk/ewk_view.cpp:
+        (_ewk_view_priv_new):
+        * ewk/ewk_view.h:
+        * ewk/ewk_view_private.h:
+
 2012-09-07  Kihong Kwon  <kihong.kwon@samsung.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/NotificationPresenterClientEfl.cpp

@@ -21 +21 @@
 #include "NotificationPresenterClientEfl.h"
 
-#if ENABLE(NOTIFICATIONS)
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
 #include "NotImplemented.h"
-#include "Notification.h"
-#include "ScriptExecutionContext.h"
-#include "SecurityOrigin.h"
-#include "ewk_security_origin_private.h"
-#include "ewk_view_private.h"
 
 namespace WebCore {
 
-NotificationPresenterClientEfl::NotificationPresenterClientEfl(Evas_Object* view)
-    : m_view(view)
+NotificationPresenterClientEfl::NotificationPresenterClientEfl()
 {
-    ASSERT(m_view);
 }
 
@@ -62 +55 @@
 }
 
-void NotificationPresenterClientEfl::requestPermission(ScriptExecutionContext* context, PassRefPtr<NotificationPermissionCallback> callback)
+void NotificationPresenterClientEfl::requestPermission(ScriptExecutionContext* context, PassRefPtr<VoidCallback> callback)
 {
-    Ewk_Security_Origin* origin = ewk_security_origin_new(context->securityOrigin());
-    m_pendingPermissionRequests.add(origin, callback);
-    ewk_view_notification_permission_request(m_view, origin);
+    notImplemented();
 }
 
 NotificationClient::Permission NotificationPresenterClientEfl::checkPermission(ScriptExecutionContext* context)
 {
-    PermissionsMap::iterator it = m_cachedPermissions.find(context->securityOrigin()->toString());
-    if (it == m_cachedPermissions.end())
-        return PermissionNotAllowed;
-    if (it->second)
-        return PermissionAllowed;
-
+    notImplemented();
     return PermissionDenied;
 }
 
-void NotificationPresenterClientEfl::addToPermissionCache(const String& domain, const bool isPermitted)
+void NotificationPresenterClientEfl::cancelRequestsForPermission(ScriptExecutionContext* context)
 {
-    PermissionsMap::iterator it = m_cachedPermissions.find(domain);
-    if (it != m_cachedPermissions.end())
-        return;
-    m_cachedPermissions.add(domain, isPermitted);
-}
-
-void NotificationPresenterClientEfl::setPermission(const Ewk_Security_Origin* origin, const bool isPermitted)
-{
-    PermissionRequestMap::iterator it = m_pendingPermissionRequests.find(origin);
-    if (it == m_pendingPermissionRequests.end())
-        return;
-
-    it->second->handleEvent(Notification::permissionString(isPermitted ? NotificationClient::PermissionAllowed : NotificationClient::PermissionDenied));
-    m_pendingPermissionRequests.remove(it);
-    m_cachedPermissions.add(String::fromUTF8(ewk_security_origin_string_get(origin)), isPermitted);
-    ewk_security_origin_free(const_cast<Ewk_Security_Origin*>(origin));
+    notImplemented();
 }
 

trunk/Source/WebKit/efl/WebCoreSupport/NotificationPresenterClientEfl.h

@@ -21 +21 @@
 #define NotificationPresenterClientEfl_h
 
-#if ENABLE(NOTIFICATIONS)
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+#include "Notification.h"
 #include "NotificationClient.h"
-#include "ewk_security_origin.h"
-#include <Evas.h>
-#include <wtf/HashMap.h>
-#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-class Notification;
+class NotificationPresenterClientEfl : public NotificationClient {
 
-class NotificationPresenterClientEfl : public NotificationClient {
 public:
-    explicit NotificationPresenterClientEfl(Evas_Object* view);
+    NotificationPresenterClientEfl();
     ~NotificationPresenterClientEfl();
 
@@ -41 +37 @@
     virtual void notificationObjectDestroyed(Notification*);
     virtual void notificationControllerDestroyed();
-#if ENABLE(LEGACY_NOTIFICATIONS)
-    virtual void requestPermission(ScriptExecutionContext*, PassRefPtr<VoidCallback>) { }
-#endif
-    virtual void requestPermission(ScriptExecutionContext*, PassRefPtr<NotificationPermissionCallback>);
+    virtual void requestPermission(ScriptExecutionContext*, PassRefPtr<VoidCallback>);
     virtual NotificationClient::Permission checkPermission(ScriptExecutionContext*);
-    virtual void cancelRequestsForPermission(ScriptExecutionContext*) { }
-
-    void addToPermissionCache(const String& domain, bool isPermitted);
-    void setPermission(const Ewk_Security_Origin*, bool isPermitted);
-
-private:
-    Evas_Object* m_view;
-
-    typedef HashMap<const Ewk_Security_Origin*, RefPtr<WebCore::NotificationPermissionCallback> > PermissionRequestMap;
-    PermissionRequestMap m_pendingPermissionRequests;
-    typedef HashMap<String, bool> PermissionsMap;
-    PermissionsMap m_cachedPermissions;
+    virtual void cancelRequestsForPermission(ScriptExecutionContext*);
 };
 

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -108 +108 @@
 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
 #include "NavigatorContentUtilsClientEfl.h"
-#endif
-
-#if ENABLE(NOTIFICATIONS)
-#include "NotificationController.h"
-#include "NotificationPresenterClientEfl.h"
 #endif
 
@@ -781 +776 @@
 #endif
 
-#if ENABLE(NOTIFICATIONS)
-    WebCore::provideNotification(priv->page.get(), new WebCore::NotificationPresenterClientEfl(smartData->self));
-#endif
-
     priv->pageSettings = priv->page->settings();
 
@@ -4575 +4566 @@
 }
 
-Eina_Bool ewk_view_notification_permission_store(Evas_Object* ewkView, const char* domain, Eina_Bool permitted)
-{
-#if ENABLE(NOTIFICATIONS)
-    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
-    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
-    static_cast<WebCore::NotificationPresenterClientEfl*>(WebCore::NotificationController::clientFrom(priv->page.get()))->addToPermissionCache(String::fromUTF8(domain), permitted);
-    return true;
-#else
-    return false;
-#endif
-}
-
-Eina_Bool ewk_view_notification_permissions_set(Evas_Object* ewkView, const Ewk_Security_Origin* origin, Eina_Bool permitted)
-{
-#if ENABLE(NOTIFICATIONS)
-    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
-    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
-    static_cast<WebCore::NotificationPresenterClientEfl*>(WebCore::NotificationController::clientFrom(priv->page.get()))->setPermission(origin, permitted);
-    return true;
-#else
-    return false;
-#endif
-}
-
-#if ENABLE(NOTIFICATIONS)
-void ewk_view_notification_permission_request(Evas_Object* ewkView, const Ewk_Security_Origin* origin)
-{
-    evas_object_smart_callback_call(ewkView, "notification,permission,request", const_cast<Ewk_Security_Origin*>(origin));
-}
-#endif
-
 namespace EWKPrivate {
 

trunk/Source/WebKit/efl/ewk/ewk_view.h

@@ -75 +75 @@
  *  - "mixedcontent,run", void: any of the containing frames has loaded and run mixed content.
  *  - "navigate,with,data", Ewk_View_Navigation_Data*: reports that view did navigation and gives the navigation details.
- *  - "notification,permission,request", const Ewk_Security_Origin*: request to confirm permission for security origin from user.
  *  - "perform,client,redirect", Ewk_View_Redirection_Data*: reports that view performed a client redirect and gives the redirection details.
  *  - "perform,server,redirect", Ewk_View_Redirection_Data*: reports that view performed a server redirect and gives the redirection details.
@@ -2748 +2747 @@
 EAPI void ewk_view_web_inspector_view_set(Evas_Object *o, Evas_Object *inspector_view);
 
-/**
- * Add permitted or denied list to the permission cache for Web Notifications.
- *
- * If there are stored permission lists for Web Notifications,
- * this function need to be called with permission.
- *
- * @param o view object to set the permission cache list.
- * @param domain string for determine the permission.
- * @param permitted @c EINA_TRUE to permit, @c EINA_FALSE to deny.
- *
- * @return @c EINA_TRUE on success or @c EINA_FALSE on failure
- */
-Eina_Bool ewk_view_notification_permission_store(Evas_Object *o, const char *domain, Eina_Bool permitted);
-
-/**
- * Set permitted or denied lists to the permission cache for the Web Notifications.
- *
- * After checking permission, this function have to be called to set permission.
- *
- * @param o view object to set the permission.
- * @param origin security origin object
- * @param permitted @c EINA_TRUE to permit, @c EINA_FALSE to deny.
- *
- * @return @c EINA_TRUE on success or @c EINA_FALSE on failure
- */
-EAPI Eina_Bool ewk_view_notification_permissions_set(Evas_Object *o, const Ewk_Security_Origin *origin, Eina_Bool permitted);
-
 #ifdef __cplusplus
 }

trunk/Source/WebKit/efl/ewk/ewk_view_private.h

@@ -157 +157 @@
 #endif
 
-#if ENABLE(NOTIFICATIONS)
-void ewk_view_notification_permission_request(Evas_Object* ewkView, const Ewk_Security_Origin* origin);
-#endif
-
 namespace EWKPrivate {
 WebCore::Page *corePage(const Evas_Object *ewkView);